Orion5x: Fix Section mismatch warnings

Wrongly placed __initdata, and missing __init caused these warnings.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>

diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index 3638e5c12b7e582e533f98200ed8a32d59aec8f6..eaac83d1df6f2207a4106276ce8d95c75b686589 100644 (file)
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -76,7 +76,7 @@ static int __init cpu_win_can_remap(const struct orion_addr_map_cfg *cfg,
 /*
  * Description of the windows needed by the platform code
  */
-static struct __initdata orion_addr_map_cfg addr_map_cfg = {
+static struct orion_addr_map_cfg addr_map_cfg __initdata = {
        .num_wins = 8,
        .cpu_win_can_remap = cpu_win_can_remap,
        .bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE,

diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 24481666d2cddb409cd0cd4e76113d06ee700f70..e2e9db492d0c3622e20a21a3832d6b485508353d 100644 (file)
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -205,7 +205,7 @@ int __init orion5x_find_tclk(void)
        return 166666667;
 }
 
-static void orion5x_timer_init(void)
+static void __init orion5x_timer_init(void)
 {
        orion5x_tclk = orion5x_find_tclk();