git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
simpad.c
diff --git
a/arch/arm/mach-sa1100/simpad.c
b/arch/arm/mach-sa1100/simpad.c
index
27692d0
..
cfb7607
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;
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)
}
static void simpad_power_off(void)
@@
-216,6
+213,10
@@
static int __init simpad_init(void)
pm_power_off = simpad_power_off;
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");
ret = platform_add_devices(devices, ARRAY_SIZE(devices));
if(ret)
printk(KERN_WARNING "simpad: Unable to register mq200 framebuffer device");