Merge remote-tracking branch 'tero/pm-linux-3.8.y' into av-3.8.y

[android-sdk/kernel-video.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 bdbb3b2460731e1d13daa26495b5f7593442dd51..040e441dab6f9e1b7403370516eb790485154741 100644 (file)
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -42,14 +42,7 @@ static void __init omap_generic_init(void)
 
        of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
 
-       /*
-        * HACK: call display setup code for selected boards to enable omapdss.
-        * This will be removed when omapdss supports DT.
-        */
-       if (of_machine_is_compatible("ti,omap4-panda"))
-               omap4_panda_display_init_of();
-       else if (of_machine_is_compatible("ti,omap4-sdp"))
-               omap_4430sdp_display_init_of();
+       omapdss_init_of();
 }
 
 #ifdef CONFIG_SOC_OMAP2420