Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d3f8f0e7a5a6268f5c9ed6e60f2256fe38ab44ea..67b07576f8bfd982149e37b4b760fd1f0e3f241b 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -275,7 +275,7 @@ config N_HDLC
 
 config RISCOM8
        tristate "SDL RISCom/8 card support"
-       depends on SERIAL_NONSTANDARD && BROKEN
+       depends on SERIAL_NONSTANDARD
        help
          This is a driver for the SDL Communications RISCom/8 multiport card,
          which gives you many serial ports. You would need something like
@@ -288,7 +288,7 @@ config RISCOM8
 
 config SPECIALIX
        tristate "Specialix IO8+ card support"
-       depends on SERIAL_NONSTANDARD && BROKEN
+       depends on SERIAL_NONSTANDARD
        help
          This is a driver for the Specialix IO8+ multiport card (both the
          ISA and the PCI version) which gives you many serial ports. You
@@ -857,13 +857,6 @@ config DS1302
 
 endif # RTC_LIB
 
-config COBALT_LCD
-       bool "Support for Cobalt LCD"
-       depends on MIPS_COBALT
-       help
-         This option enables support for the LCD display and buttons found
-         on Cobalt systems through a misc device.
-
 config DTLK
        tristate "Double Talk PC internal speech card support"
        depends on ISA