| From aedd3e4430266d9fb49b55a9848fd858edd6e973 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Mon, 17 Feb 2014 15:35:10 +0900 |
| Subject: ARM: shmobile: Remove __init from rcar_gen2_read_mode_pins() |
| |
| Remove __init from rcar_gen2_read_mode_pins() to allow |
| it to be used after boot. For instance the R-Car Gen2 |
| MD21 check is needed even in the case of CPU Hotplug. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit e7509f6eca10cff3933f8a71f4ca9d8be8447ec3) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c |
| index 69ccc6c6fd33..10604480f325 100644 |
| --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c |
| +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c |
| @@ -28,7 +28,7 @@ |
| |
| #define MODEMR 0xe6160060 |
| |
| -u32 __init rcar_gen2_read_mode_pins(void) |
| +u32 rcar_gen2_read_mode_pins(void) |
| { |
| void __iomem *modemr = ioremap_nocache(MODEMR, 4); |
| u32 mode; |
| -- |
| 2.1.2 |
| |
