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-prima2/common.h | |
| parent | 3d8360d3556c1d98ea4ac130aed70db4a8f25f65 (diff) | |
| parent | a32473271de52a37a39a941c5cd25970d8bcdf43 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm/mach-prima2/common.h')
| -rw-r--r-- | arch/arm/mach-prima2/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h index 81135cd88e54..a6304858474a 100644 --- a/arch/arm/mach-prima2/common.h +++ b/arch/arm/mach-prima2/common.h @@ -10,6 +10,8 @@ #define __MACH_PRIMA2_COMMON_H__ #include <linux/init.h> +#include <linux/reboot.h> + #include <asm/mach/time.h> #include <asm/exception.h> @@ -22,7 +24,7 @@ extern void sirfsoc_cpu_die(unsigned int cpu); extern void __init sirfsoc_of_irq_init(void); extern void __init sirfsoc_of_clk_init(void); -extern void sirfsoc_restart(char, const char *); +extern void sirfsoc_restart(enum reboot_mode, const char *); extern asmlinkage void __exception_irq_entry sirfsoc_handle_irq(struct pt_regs *regs); #ifndef CONFIG_DEBUG_LL |