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 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-h4.c
diff --git
a/arch/arm/mach-omap2/board-h4.c
b/arch/arm/mach-omap2/board-h4.c
index
7e6bf4f
..
bac7933
100644
(file)
--- a/
arch/arm/mach-omap2/board-h4.c
+++ b/
arch/arm/mach-omap2/board-h4.c
@@
-299,7
+299,6
@@
static void __init omap_h4_init_early(void)
static void __init omap_h4_init_irq(void)
{
omap_init_irq();
static void __init omap_h4_init_irq(void)
{
omap_init_irq();
- h4_init_flash();
}
static struct at24_platform_data m24c01 = {
}
static struct at24_platform_data m24c01 = {
@@
-372,6
+371,7
@@
static void __init omap_h4_init(void)
platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
omap2_usbfs_init(&h4_usb_config);
omap_serial_init();
platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
omap2_usbfs_init(&h4_usb_config);
omap_serial_init();
+ h4_init_flash();
}
static void __init omap_h4_map_io(void)
}
static void __init omap_h4_map_io(void)