Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c40e487..1b21c3a 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -439,6 +439,14 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
+config MSPEC
+       tristate "Memory special operations driver"
+       depends on IA64
+       help
+         If you have an ia64 and you want to enable memory special
+         operations support (formerly known as fetchop), say Y here,
+         otherwise say N.
+
 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS
@@ -495,6 +503,21 @@ config LEGACY_PTY_COUNT
          When not in use, each legacy PTY occupies 12 bytes on 32-bit
          architectures and 24 bytes on 64-bit architectures.
 
+config BRIQ_PANEL
+       tristate 'Total Impact briQ front panel driver'
+       depends on PPC_CHRP
+       ---help---
+         The briQ is a small footprint CHRP computer with a frontpanel VFD, a
+         tristate led and two switches. It is the size of a CDROM drive.
+
+         If you have such one and want anything showing on the VFD then you
+         must answer Y here.
+
+         To compile this driver as a module, choose M here: the
+         module will be called briq_panel.
+
+         It's safe to say N here.
+
 config PRINTER
        tristate "Parallel printer support"
        depends on PARPORT
@@ -596,6 +619,13 @@ config HVC_CONSOLE
          console. This driver allows each pSeries partition to have a console
          which is accessed via the HMC.
 
+config HVC_ISERIES
+       bool "iSeries Hypervisor Virtual Console support"
+       depends on PPC_ISERIES && !VIOCONS
+       select HVC_DRIVER
+       help
+         iSeries machines support a hypervisor virtual console.
+
 config HVC_RTAS
        bool "IBM RTAS Console support"
        depends on PPC_RTAS
@@ -717,7 +747,7 @@ config NVRAM
 
 config RTC
        tristate "Enhanced Real Time Clock Support"
-       depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM
+       depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH
        ---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