Merge commit 'v2.6.26-rc8' into x86/mce

[linux-2.6-omap-h63xx.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 20a2bbd14ed701e0aaf639a690a1b581e6ebcd46..002b61b4f0f6d9fba9c48a9f3216068f816b9ce4 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -171,7 +171,6 @@ config FB_SYS_FOPS
 config FB_DEFERRED_IO
        bool
        depends on FB
-       default y
 
 config FB_METRONOME
        tristate
@@ -628,11 +627,9 @@ config FB_MAC
        select FB_CFB_IMAGEBLIT
        select FB_MACMODES
 
-#      bool '  Apple DAFB display support' CONFIG_FB_DAFB
 config FB_HP300
        bool
-       depends on (FB = y) && HP300
-       select FB_CFB_FILLRECT
+       depends on (FB = y) && DIO
        select FB_CFB_IMAGEBLIT
        default y
 
@@ -1776,7 +1773,7 @@ config FB_PXA
 
 config FB_PXA_SMARTPANEL
        bool "PXA Smartpanel LCD support"
-       default y
+       default n
        depends on FB_PXA
 
 config FB_PXA_PARAMETERS