Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c8dfd18..bf18d75 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -130,6 +130,7 @@ config ROCKETPORT
 config CYCLADES
        tristate "Cyclades async mux support"
        depends on SERIAL_NONSTANDARD && (PCI || ISA)
+       select FW_LOADER
        ---help---
          This driver supports Cyclades Z and Y multiserial boards.
          You would need something like this to connect more than two modems to
@@ -567,8 +568,8 @@ config TIPAR
 config HVC_DRIVER
        bool
        help
-         Users of pSeries machines that want to utilize the hvc console front-end
-         module for their backend console driver should select this option.
+         Generic "hypervisor virtual console" infrastructure for various
+         hypervisors (pSeries, iSeries, Xen, lguest).
          It will automatically be selected if one of the back-end console drivers
          is selected.
 
@@ -612,6 +613,10 @@ config HVC_XEN
        help
          Xen virtual console device driver
 
+config VIRTIO_CONSOLE
+       bool
+       select HVC_DRIVER
+
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES
@@ -631,8 +636,6 @@ config HVCS
 
 source "drivers/char/ipmi/Kconfig"
 
-source "drivers/char/watchdog/Kconfig"
-
 config DS1620
        tristate "NetWinder thermometer support"
        depends on ARCH_NETWINDER
@@ -726,7 +729,7 @@ config NVRAM
 
 config RTC
        tristate "Enhanced Real Time Clock Support"
-       depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC64 && (!SPARC32 || PCI) && !FRV && !ARM && !SUPERH && !S390
+       depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV && !ARM && !SUPERH && !S390
        ---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
@@ -750,6 +753,28 @@ config RTC
          To compile this driver as a module, choose M here: the
          module will be called rtc.
 
+config JS_RTC
+       tristate "Enhanced Real Time Clock Support"
+       depends on SPARC32 && PCI
+       ---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 (or hardware clock) built
+         into your computer.
+
+         Every PC has such a clock built in. It can be used to generate
+         signals from as low as 1Hz up to 8192Hz, and can also be used
+         as a 24 hour alarm. It reports status information via the file
+         /proc/driver/rtc and its behaviour is set by various ioctls on
+         /dev/rtc.
+
+         If you think you have a use for such a device (such as periodic data
+         sampling), then say Y here, and read <file:Documentation/rtc.txt>
+         for details.
+
+         To compile this driver as a module, choose M here: the
+         module will be called js-rtc.
+
 config SGI_DS1286
        tristate "SGI DS1286 RTC support"
        depends on SGI_IP22
@@ -873,10 +898,6 @@ config GPIO_TB0219
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 
-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
-
 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE