[PATCH] md: remove slashes from disk names when creation dev names in sysfs

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

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3e470c8b4193a56564ce39d3dc11ec919afc7260..3e153d313bb01457cc54401925f78aad88da734c 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -536,13 +536,13 @@ config FB_SUN3
 
 config FB_SBUS
        bool "SBUS and UPA framebuffers"
-       depends on (FB = y) && (SPARC32 || SPARC64)
+       depends on (FB = y) && SPARC
        help
          Say Y if you want support for SBUS or UPA based frame buffer device.
 
 config FB_BW2
        bool "BWtwo support"
-       depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+       depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -551,7 +551,7 @@ config FB_BW2
 
 config FB_CG3
        bool "CGthree support"
-       depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+       depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -560,7 +560,7 @@ config FB_CG3
 
 config FB_CG6
        bool "CGsix (GX,TurboGX) support"
-       depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+       depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        help
@@ -993,12 +993,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 +1145,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---
@@ -1268,7 +1262,7 @@ config FB_LEO
 
 config FB_PCI
        bool "PCI framebuffers"
-       depends on (FB = y) && PCI && (SPARC64 || SPARC32)
+       depends on (FB = y) && PCI && SPARC
 
 config FB_IGA
        bool "IGA 168x display support"
@@ -1376,7 +1370,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 +1403,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.