diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 12:00:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-12 12:00:23 -0700 |
| commit | 1a2217a9516b134e0a0e54cb4629e1e075d97b17 (patch) | |
| tree | 044db08962769ede5a6a40d331c19edd43bdbac4 /arch/avr32/kernel/process.c | |
| parent | 46b5e34029fef7a042f3ff16e319e737257e5c7b (diff) | |
| parent | 6eb3ebe04da4c8f31d776217b0b76ca3d00f20b1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Fix build failures in board code
avr32: Allow selecting multiple pins at once
avr32: Minor pm_power_off cleanup
avr32: Implement {read,write}[bwl]_be
avr32: Replace static clock list with dynamic linked list
avr32: Use platform_driver_probe for pdc platform driver
avr32: Use platform_driver_probe for pio platform driver
avr32: Provide a way to deselect pins in the portmux
ngw100: export J15 through sysfs
avr32: Allow fine-grained control over LCDC pins
avr32: added mem kernel command line option support
Add kernel support for oprofile callgraphs on AVR32
avr32: use the new byteorder headers
Diffstat (limited to 'arch/avr32/kernel/process.c')
| -rw-r--r-- | arch/avr32/kernel/process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c index 2c08ac992ac..134d5302b6d 100644 --- a/arch/avr32/kernel/process.c +++ b/arch/avr32/kernel/process.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/kallsyms.h> #include <linux/fs.h> +#include <linux/pm.h> #include <linux/ptrace.h> #include <linux/reboot.h> #include <linux/tick.h> @@ -20,7 +21,7 @@ #include <mach/pm.h> -void (*pm_power_off)(void) = NULL; +void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); /* |