Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index ee88dfc..f9e31a5 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -349,7 +349,7 @@ config ISTALLION
          module will be called istallion.
 
 config SERIAL_TX3912
-       bool "TMPTX3912/PR31700 serial port support"
+       bool "TX3912/PR31700 serial port support"
        depends on SERIAL_NONSTANDARD && MIPS && BROKEN_ON_SMP
        help
          The TX3912 is a Toshiba RISC processor based o the MIPS 3900 core;
@@ -357,7 +357,7 @@ config SERIAL_TX3912
          Say Y here to enable kernel support for the on-board serial port.
 
 config SERIAL_TX3912_CONSOLE
-       bool "Console on TMPTX3912/PR31700 serial port"
+       bool "Console on TX3912/PR31700 serial port"
        depends on SERIAL_TX3912
        help
          The TX3912 is a Toshiba RISC processor based o the MIPS 3900 core;
@@ -755,6 +755,28 @@ config RTC
          To compile this driver as a module, choose M here: the
          module will be called rtc.
 
+config SGI_DS1286
+       tristate "SGI DS1286 RTC support"
+       depends on SGI_IP22
+       help
+         If you say Y here and create a character special file /dev/rtc with
+         major number 10 and minor number 135 using mknod ("man mknod"), you
+         will get access to the real time clock built into your computer.
+         Every SGI has such a clock built in. It reports status information
+         via the file /proc/rtc and its behaviour is set by various ioctls on
+         /dev/rtc.
+
+config SGI_IP27_RTC
+       bool "SGI M48T35 RTC support"
+       depends on SGI_IP27
+       help
+         If you say Y here and create a character special file /dev/rtc with
+         major number 10 and minor number 135 using mknod ("man mknod"), you
+         will get access to the real time clock built into your computer.
+         Every SGI has such a clock built in. It reports status information
+         via the file /proc/rtc and its behaviour is set by various ioctls on
+         /dev/rtc.
+
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
        depends on RTC!=y && !IA64
@@ -784,15 +806,12 @@ config EFI_RTC
        bool "EFI Real Time Clock Services"
        depends on IA64
 
-config H8
-       bool "Tadpole ANA H8 Support (OBSOLETE)"
-       depends on OBSOLETE && ALPHA_BOOK1
+config COBALT_LCD
+       bool "Support for Cobalt LCD"
+       depends on MIPS_COBALT
        help
-         The Hitachi H8/337 is a microcontroller used to deal with the power
-         and thermal environment. If you say Y here, you will be able to
-         communicate with it via a character special device.
-
-         If unsure, say N.
+         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"
@@ -944,8 +963,8 @@ config HPET
        default n
        depends on ACPI
        help
-         If you say Y here, you will have a device named "/dev/hpet/XX" for
-         each timer supported by the HPET.  The timers are
+         If you say Y here, you will have a miscdevice named "/dev/hpet/".  Each
+         open selects one of the timers supported by the HPET.  The timers are
          non-periodioc and/or periodic.
 
 config HPET_RTC_IRQ