disable FB_OMAP2 as it conmflicts with the OMAP KMS driver

This commit is contained in:
Dennis Gilmore 2012-05-03 16:36:16 -05:00
parent 8acca8699f
commit fbdf88c7b3

View File

@ -693,9 +693,7 @@ CONFIG_OMAP4_DSS_HDMI=y
CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1
CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y CONFIG_OMAP2_DSS_SLEEP_BEFORE_RESET=y
CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
CONFIG_FB_OMAP2=y # CONFIG_FB_OMAP2 is not set
CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
CONFIG_FB_OMAP2_NUM_FBS=3
# #
# OMAP2/3 Display Device Drivers # OMAP2/3 Display Device Drivers