Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-sa1100 / simpad.c

diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 27692d0ffbe81c9d2a5e6931bc323f107973c7c6..cfb76077bd25a19e35e2b1a98134c8896b4b4c74 100644 (file)
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -166,9 +166,6 @@ static void __init simpad_map_io(void)
        PCFR = 0;
        PSDR = 0;
 
-       sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources,
-                             ARRAY_SIZE(simpad_flash_resources));
-       sa11x0_register_mcp(&simpad_mcp_data);
 }
 
 static void simpad_power_off(void)
@@ -216,6 +213,10 @@ static int __init simpad_init(void)
 
        pm_power_off = simpad_power_off;
 
+       sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources,
+                             ARRAY_SIZE(simpad_flash_resources));
+       sa11x0_register_mcp(&simpad_mcp_data);
+
        ret = platform_add_devices(devices, ARRAY_SIZE(devices));
        if(ret)
                printk(KERN_WARNING "simpad: Unable to register mq200 framebuffer device");