diff options
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/common.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-integrator/core.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/common.h b/arch/arm/mach-integrator/common.h index 72516658be1e..ad0ac5547b2c 100644 --- a/arch/arm/mach-integrator/common.h +++ b/arch/arm/mach-integrator/common.h | |||
@@ -1,7 +1,8 @@ | |||
1 | #include <linux/reboot.h> | ||
1 | #include <linux/amba/serial.h> | 2 | #include <linux/amba/serial.h> |
2 | extern struct amba_pl010_data ap_uart_data; | 3 | extern struct amba_pl010_data ap_uart_data; |
3 | void integrator_init_early(void); | 4 | void integrator_init_early(void); |
4 | int integrator_init(bool is_cp); | 5 | int integrator_init(bool is_cp); |
5 | void integrator_reserve(void); | 6 | void integrator_reserve(void); |
6 | void integrator_restart(char, const char *); | 7 | void integrator_restart(enum reboot_mode, const char *); |
7 | void integrator_init_sysfs(struct device *parent, u32 id); | 8 | void integrator_init_sysfs(struct device *parent, u32 id); |
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 81461d218717..4cdfd7365925 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
@@ -124,7 +124,7 @@ void __init integrator_reserve(void) | |||
124 | /* | 124 | /* |
125 | * To reset, we hit the on-board reset register in the system FPGA | 125 | * To reset, we hit the on-board reset register in the system FPGA |
126 | */ | 126 | */ |
127 | void integrator_restart(char mode, const char *cmd) | 127 | void integrator_restart(enum reboot_mode mode, const char *cmd) |
128 | { | 128 | { |
129 | cm_control(CM_CTRL_RESET, CM_CTRL_RESET); | 129 | cm_control(CM_CTRL_RESET, CM_CTRL_RESET); |
130 | } | 130 | } |