diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:11:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:11:10 +1000 |
| commit | 92221d1fc707b50772262839aef545c1f5fbc94e (patch) | |
| tree | e579d1228a662e47345cea17e89fb2607263b0b1 /arch/arm/mach-ixp4xx/include/mach/platform.h | |
| parent | 3d8360d3556c1d98ea4ac130aed70db4a8f25f65 (diff) | |
| parent | a32473271de52a37a39a941c5cd25970d8bcdf43 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm/mach-ixp4xx/include/mach/platform.h')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/platform.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/platform.h b/arch/arm/mach-ixp4xx/include/mach/platform.h index db5afb69c123..4c4c6a6f4526 100644 --- a/arch/arm/mach-ixp4xx/include/mach/platform.h +++ b/arch/arm/mach-ixp4xx/include/mach/platform.h @@ -13,6 +13,8 @@ #ifndef __ASSEMBLY__ +#include <linux/reboot.h> + #include <asm/types.h> #ifndef __ARMEB__ @@ -123,7 +125,7 @@ extern void ixp4xx_init_early(void); extern void ixp4xx_init_irq(void); extern void ixp4xx_sys_init(void); extern void ixp4xx_timer_init(void); -extern void ixp4xx_restart(char, const char *); +extern void ixp4xx_restart(enum reboot_mode, const char *); extern void ixp4xx_pci_preinit(void); struct pci_sys_data; extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); |