diff options
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 5b1c8bfe6fa9..c85ddb2a0ad0 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | #include <linux/irqchip/arm-gic.h> | 30 | #include <linux/irqchip/arm-gic.h> |
31 | #include <linux/platform_data/clk-realview.h> | 31 | #include <linux/platform_data/clk-realview.h> |
32 | #include <linux/reboot.h> | ||
32 | 33 | ||
33 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
@@ -418,7 +419,7 @@ static void __init realview_eb_timer_init(void) | |||
418 | realview_eb_twd_init(); | 419 | realview_eb_twd_init(); |
419 | } | 420 | } |
420 | 421 | ||
421 | static void realview_eb_restart(char mode, const char *cmd) | 422 | static void realview_eb_restart(enum reboot_mode mode, const char *cmd) |
422 | { | 423 | { |
423 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); | 424 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); |
424 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); | 425 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); |
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index d5e83a1f6982..c5eade76461b 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
32 | #include <linux/irqchip/arm-gic.h> | 32 | #include <linux/irqchip/arm-gic.h> |
33 | #include <linux/platform_data/clk-realview.h> | 33 | #include <linux/platform_data/clk-realview.h> |
34 | #include <linux/reboot.h> | ||
34 | 35 | ||
35 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
36 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
@@ -329,7 +330,7 @@ static void __init realview_pb1176_timer_init(void) | |||
329 | realview_timer_init(IRQ_DC1176_TIMER0); | 330 | realview_timer_init(IRQ_DC1176_TIMER0); |
330 | } | 331 | } |
331 | 332 | ||
332 | static void realview_pb1176_restart(char mode, const char *cmd) | 333 | static void realview_pb1176_restart(enum reboot_mode mode, const char *cmd) |
333 | { | 334 | { |
334 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); | 335 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); |
335 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); | 336 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index c3cfe213b5e6..f4b0962578fe 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | #include <linux/irqchip/arm-gic.h> | 30 | #include <linux/irqchip/arm-gic.h> |
31 | #include <linux/platform_data/clk-realview.h> | 31 | #include <linux/platform_data/clk-realview.h> |
32 | #include <linux/reboot.h> | ||
32 | 33 | ||
33 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
@@ -316,7 +317,7 @@ static void __init realview_pb11mp_timer_init(void) | |||
316 | realview_pb11mp_twd_init(); | 317 | realview_pb11mp_twd_init(); |
317 | } | 318 | } |
318 | 319 | ||
319 | static void realview_pb11mp_restart(char mode, const char *cmd) | 320 | static void realview_pb11mp_restart(enum reboot_mode mode, const char *cmd) |
320 | { | 321 | { |
321 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); | 322 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); |
322 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); | 323 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); |
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index dde652a59620..10a3e1d76891 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | #include <linux/irqchip/arm-gic.h> | 30 | #include <linux/irqchip/arm-gic.h> |
31 | #include <linux/platform_data/clk-realview.h> | 31 | #include <linux/platform_data/clk-realview.h> |
32 | #include <linux/reboot.h> | ||
32 | 33 | ||
33 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
34 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
@@ -264,7 +265,7 @@ static void __init realview_pba8_timer_init(void) | |||
264 | realview_timer_init(IRQ_PBA8_TIMER0_1); | 265 | realview_timer_init(IRQ_PBA8_TIMER0_1); |
265 | } | 266 | } |
266 | 267 | ||
267 | static void realview_pba8_restart(char mode, const char *cmd) | 268 | static void realview_pba8_restart(enum reboot_mode mode, const char *cmd) |
268 | { | 269 | { |
269 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); | 270 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); |
270 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); | 271 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); |
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 54f0185b01e3..9d75493e3f0c 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
29 | #include <linux/irqchip/arm-gic.h> | 29 | #include <linux/irqchip/arm-gic.h> |
30 | #include <linux/platform_data/clk-realview.h> | 30 | #include <linux/platform_data/clk-realview.h> |
31 | #include <linux/reboot.h> | ||
31 | 32 | ||
32 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
33 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
@@ -344,7 +345,7 @@ static void realview_pbx_fixup(struct tag *tags, char **from, | |||
344 | #endif | 345 | #endif |
345 | } | 346 | } |
346 | 347 | ||
347 | static void realview_pbx_restart(char mode, const char *cmd) | 348 | static void realview_pbx_restart(enum reboot_mode mode, const char *cmd) |
348 | { | 349 | { |
349 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); | 350 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); |
350 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); | 351 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); |