diff options
author | Dennis Gilmore <dennis@ausil.us> | 2012-05-03 16:36:16 -0500 |
---|---|---|
committer | Dennis Gilmore <dennis@ausil.us> | 2012-05-03 16:36:16 -0500 |
commit | fbdf88c7b39d14eca78a24e14c304872beb4fc33 (patch) | |
tree | 84a626ca5f01956e320158213774404487fb75b2 /config-arm-omap | |
parent | 8acca8699f585d6273cdecf8a975ca1f585a39e5 (diff) | |
download | kernel-fbdf88c7b39d14eca78a24e14c304872beb4fc33.tar.gz kernel-fbdf88c7b39d14eca78a24e14c304872beb4fc33.tar.xz kernel-fbdf88c7b39d14eca78a24e14c304872beb4fc33.zip |
disable FB_OMAP2 as it conmflicts with the OMAP KMS driver
Diffstat (limited to 'config-arm-omap')
-rw-r--r-- | config-arm-omap | 4 |
1 files changed, 1 insertions, 3 deletions
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 |