Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[karo-tx-linux.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 615874e03ce8bbad26eab9f992b5a43632a02071..7e297947a2b2e201423bd296295b987b1dd59ef0 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -650,6 +650,7 @@ config FB_NVIDIA
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
+       select FB_SOFT_CURSOR
        help
          This driver supports graphics boards with the nVidia chips, TNT
          and newer. For very old chipsets, such as the RIVA128, then use
@@ -753,7 +754,8 @@ config FB_I810_GTF
 
 config FB_I810_I2C
        bool "Enable DDC Support"
-       depends on FB_I810 && I2C && FB_I810_GTF
+       depends on FB_I810 && FB_I810_GTF
+       select I2C
        select I2C_ALGOBIT
        help
 
@@ -766,6 +768,7 @@ config FB_INTEL
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
+       select FB_SOFT_CURSOR
        help
          This driver supports the on-board graphics built in to the Intel
           830M/845G/852GM/855GM/865G chipsets.
@@ -1373,7 +1376,7 @@ config FB_HIT
 
 config FB_PMAG_AA
        bool "PMAG-AA TURBOchannel framebuffer support"
-       depends on (FB = y) && MACH_DECSTATION && TC
+       depends on (FB = y) && TC
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1384,7 +1387,7 @@ config FB_PMAG_AA
 
 config FB_PMAG_BA
        bool "PMAG-BA TURBOchannel framebuffer support"
-       depends on (FB = y) && MACH_DECSTATION && TC
+       depends on (FB = y) && TC
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1395,7 +1398,7 @@ config FB_PMAG_BA
 
 config FB_PMAGB_B
        bool "PMAGB-B TURBOchannel framebuffer support"
-       depends on (FB = y) && MACH_DECSTATION && TC
+       depends on (FB = y) && TC
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1407,7 +1410,7 @@ config FB_PMAGB_B
 
 config FB_MAXINE
        bool "Maxine (Personal DECstation) onboard framebuffer support"
-       depends on (FB = y) && MACH_DECSTATION && TC
+       depends on (FB = y) && MACH_DECSTATION
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT