Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a7ef542afbc20d87336ef122aaca2f3f846b3481..0e6f35fcc2ebf9ed0fd36ddaa74c5faf3b8cedac 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -371,36 +371,6 @@ config AU1000_SERIAL_CONSOLE
          If you have an Alchemy AU1000 processor (MIPS based) and you want
          to use a console on a serial port, say Y.  Otherwise, say N.
 
          If you have an Alchemy AU1000 processor (MIPS based) and you want
          to use a console on a serial port, say Y.  Otherwise, say N.
 

-config QTRONIX_KEYBOARD
-       bool "Enable Qtronix 990P Keyboard Support"
-       depends on IT8712
-       help
-         Images of Qtronix keyboards are at
-         <http://www.qtronix.com/keyboard.html>.
-
-config IT8172_CIR
-       bool
-       depends on QTRONIX_KEYBOARD
-       default y
-
-config IT8172_SCR0
-       bool "Enable Smart Card Reader 0 Support "
-       depends on IT8712
-       help
-         Say Y here to support smart-card reader 0 (SCR0) on the Integrated
-         Technology Express, Inc. ITE8172 SBC.  Vendor page at
-         <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-         board at <http://www.mvista.com/partners/semiconductor/ite.html>.
-
-config IT8172_SCR1
-       bool "Enable Smart Card Reader 1 Support "
-       depends on IT8712
-       help
-         Say Y here to support smart-card reader 1 (SCR1) on the Integrated
-         Technology Express, Inc. ITE8172 SBC.  Vendor page at
-         <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-         board at <http://www.mvista.com/partners/semiconductor/ite.html>.
-

 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP
 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP


@@ -439,6 +409,14 @@ config SGI_MBCS
          If you have an SGI Altix with an attached SABrick
          say Y or M here, otherwise say N.
 
          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
 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS


@@ -497,6 +475,7 @@ config LEGACY_PTY_COUNT
 
 config BRIQ_PANEL
        tristate 'Total Impact briQ front panel driver'
 
 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.
        ---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.


@@ -738,7 +717,7 @@ config NVRAM
 
 config RTC
        tristate "Enhanced Real Time Clock Support"
 
 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
        ---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


@@ -822,14 +801,6 @@ config DS1302
          will get access to the real time clock (or hardware clock) built
          into your computer.
 
          will get access to the real time clock (or hardware clock) built
          into your computer.
 

-config S3C2410_RTC
-       bool "S3C2410 RTC Driver"
-       depends on ARCH_S3C2410
-       help
-         RTC (Realtime Clock) driver for the clock inbuilt into the
-         Samsung S3C2410. This can provide periodic interrupt rates
-         from 1Hz to 64Hz for user programs, and wakeup from Alarm.
-

 config COBALT_LCD
        bool "Support for Cobalt LCD"
        depends on MIPS_COBALT
 config COBALT_LCD
        bool "Support for Cobalt LCD"
        depends on MIPS_COBALT


@@ -1005,6 +976,7 @@ config GPIO_VR41XX
 
 config RAW_DRIVER
        tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
 
 config RAW_DRIVER
        tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"

+       depends on BLOCK

        help
          The raw driver permits block devices to be bound to /dev/raw/rawN. 
          Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. 
        help
          The raw driver permits block devices to be bound to /dev/raw/rawN. 
          Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.