Merge branch 'depends/rmk/devel-stable' into next/cleanup

[deliverable/linux.git] / arch / arm / mach-omap2 / board-generic.c

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 25642697281b6d21ddf68fee8ef681524980eaaa..e8d45d3bd3e049fc18726fe791d5cef649f9b31d 100644 (file)
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -36,12 +36,12 @@ static struct omap_board_config_kernel generic_config[] = {
 static void __init omap_generic_init_early(void)
 {
        omap2_init_common_infrastructure();
-       omap2_init_common_devices(NULL, NULL);
 }
 
 static void __init omap_generic_init(void)
 {
        omap_serial_init();
+       omap_sdrc_init(NULL, NULL);
        omap_board_config = generic_config;
        omap_board_config_size = ARRAY_SIZE(generic_config);
 }