diff options
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r-- | arch/arm/mach-iop13xx/include/mach/iop13xx.h | 5 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/setup.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h index 7480f58267aa..17b40279e0a4 100644 --- a/arch/arm/mach-iop13xx/include/mach/iop13xx.h +++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h | |||
@@ -2,6 +2,9 @@ | |||
2 | #define _IOP13XX_HW_H_ | 2 | #define _IOP13XX_HW_H_ |
3 | 3 | ||
4 | #ifndef __ASSEMBLY__ | 4 | #ifndef __ASSEMBLY__ |
5 | |||
6 | #include <linux/reboot.h> | ||
7 | |||
5 | /* The ATU offsets can change based on the strapping */ | 8 | /* The ATU offsets can change based on the strapping */ |
6 | extern u32 iop13xx_atux_pmmr_offset; | 9 | extern u32 iop13xx_atux_pmmr_offset; |
7 | extern u32 iop13xx_atue_pmmr_offset; | 10 | extern u32 iop13xx_atue_pmmr_offset; |
@@ -11,7 +14,7 @@ void iop13xx_map_io(void); | |||
11 | void iop13xx_platform_init(void); | 14 | void iop13xx_platform_init(void); |
12 | void iop13xx_add_tpmi_devices(void); | 15 | void iop13xx_add_tpmi_devices(void); |
13 | void iop13xx_init_irq(void); | 16 | void iop13xx_init_irq(void); |
14 | void iop13xx_restart(char, const char *); | 17 | void iop13xx_restart(enum reboot_mode, const char *); |
15 | 18 | ||
16 | /* CPUID CP6 R0 Page 0 */ | 19 | /* CPUID CP6 R0 Page 0 */ |
17 | static inline int iop13xx_cpu_id(void) | 20 | static inline int iop13xx_cpu_id(void) |
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c index 1c5bd7637b05..96e6c7a6793b 100644 --- a/arch/arm/mach-iop13xx/setup.c +++ b/arch/arm/mach-iop13xx/setup.c | |||
@@ -594,7 +594,7 @@ __setup("iop13xx_init_adma", iop13xx_init_adma_setup); | |||
594 | __setup("iop13xx_init_uart", iop13xx_init_uart_setup); | 594 | __setup("iop13xx_init_uart", iop13xx_init_uart_setup); |
595 | __setup("iop13xx_init_i2c", iop13xx_init_i2c_setup); | 595 | __setup("iop13xx_init_i2c", iop13xx_init_i2c_setup); |
596 | 596 | ||
597 | void iop13xx_restart(char mode, const char *cmd) | 597 | void iop13xx_restart(enum reboot_mode mode, const char *cmd) |
598 | { | 598 | { |
599 | /* | 599 | /* |
600 | * Reset the internal bus (warning both cores are reset) | 600 | * Reset the internal bus (warning both cores are reset) |