diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-10 12:51:29 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-10 12:51:29 -0500 |
| commit | 42924355204bd83d799bd151211ae6e014982849 (patch) | |
| tree | a2938faaefb04c6f430e7fc10031f5187a7bf0a2 | |
| parent | 0dde52a9f5330eec240660191a94b51bd911ffcd (diff) | |
omap: Fix H4 init_irq to not call h4_init_flash
There should be no reason to call h4_init_flash this
early. It causes problems as things are not yet initialized.
Tested-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 7e6bf4fa153..bac7933b8cb 100644 --- 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) | |||
| 299 | static void __init omap_h4_init_irq(void) | 299 | static void __init omap_h4_init_irq(void) |
| 300 | { | 300 | { |
| 301 | omap_init_irq(); | 301 | omap_init_irq(); |
| 302 | h4_init_flash(); | ||
| 303 | } | 302 | } |
| 304 | 303 | ||
| 305 | static struct at24_platform_data m24c01 = { | 304 | static struct at24_platform_data m24c01 = { |
| @@ -372,6 +371,7 @@ static void __init omap_h4_init(void) | |||
| 372 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); | 371 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); |
| 373 | omap2_usbfs_init(&h4_usb_config); | 372 | omap2_usbfs_init(&h4_usb_config); |
| 374 | omap_serial_init(); | 373 | omap_serial_init(); |
| 374 | h4_init_flash(); | ||
| 375 | } | 375 | } |
| 376 | 376 | ||
| 377 | static void __init omap_h4_map_io(void) | 377 | static void __init omap_h4_map_io(void) |
