Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[~andy/linux] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index bb1dadaa4a23a1054cca3fbd56791d3cf50fcb1d..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