[PATCH] USB: SN9C10x driver updates

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

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index cc8e3bf5001b44e5393ae7783427fe2ad3204cbf..f5079c78ba4e0ed51829bf4b2cc669e3c1cb4cd2 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -520,16 +520,11 @@ config FB_GBE
 config FB_GBE_MEM
        int "Video memory size in MB"
        depends on FB_GBE
-       default 8
+       default 4
        help
          This is the amount of memory reserved for the framebuffer,
          which can be any value between 1MB and 8MB.
 
-config BUS_I2C
-       bool
-       depends on (FB = y) && VISWS
-       default y
-
 config FB_SUN3
        bool "Sun3 framebuffer support"
        depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
@@ -993,12 +988,6 @@ config FB_ATY_GENERIC_LCD
          Say Y if you have a laptop with an ATI Rage LT PRO, Rage Mobility,
          Rage XC, or Rage XL chipset.
 
-config FB_ATY_XL_INIT
-       bool "Rage XL No-BIOS Init support"
-       depends on FB_ATY_CT
-       help
-         Say Y here to support booting a Rage XL without BIOS support.
-
 config FB_ATY_GX
        bool "Mach64 GX support" if PCI
        depends on FB_ATY
@@ -1151,7 +1140,7 @@ config FB_VOODOO1
 
 config FB_CYBLA
        tristate "Cyberblade/i1 support"
-       depends on FB && PCI
+       depends on FB && PCI && X86_32 && !64BIT
        select FB_CFB_IMAGEBLIT
        select VIDEO_SELECT
        ---help---
@@ -1376,7 +1365,7 @@ config FB_PXA
 
          This driver is also available as a module ( = code which can be
          inserted and removed from the running kernel whenever you want). The
-         module will be called vfb. If you want to compile it as a module,
+         module will be called pxafb. If you want to compile it as a module,
          say M here and read <file:Documentation/modules.txt>.
 
          If unsure, say N.
@@ -1409,7 +1398,7 @@ config FB_W100
 
          This driver is also available as a module ( = code which can be
          inserted and removed from the running kernel whenever you want). The
-         module will be called vfb. If you want to compile it as a module,
+         module will be called w100fb. If you want to compile it as a module,
          say M here and read <file:Documentation/modules.txt>.
 
          If unsure, say N.