From fbdf88c7b39d14eca78a24e14c304872beb4fc33 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 3 May 2012 16:36:16 -0500 Subject: disable FB_OMAP2 as it conmflicts with the OMAP KMS driver --- config-arm-omap | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'config-arm-omap') diff --git a/config-arm-omap b/config-arm-omap index a09807c30..adc8fa6f5 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -693,9 +693,7 @@ CONFIG_OMAP4_DSS_HDMI=y CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1 CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y -CONFIG_FB_OMAP2=y -CONFIG_FB_OMAP2_DEBUG_SUPPORT=y -CONFIG_FB_OMAP2_NUM_FBS=3 +# CONFIG_FB_OMAP2 is not set # # OMAP2/3 Display Device Drivers -- cgit