fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index f7bfe20..20ef466 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -59,9 +59,26 @@ config VT_CONSOLE
 
 config HW_CONSOLE
        bool
 
 config HW_CONSOLE
        bool

-       depends on VT && !S390 && !USERMODE
+       depends on VT && !S390 && !UML

        default y
 
        default y
 

+config VT_HW_CONSOLE_BINDING
+       bool "Support for binding and unbinding console drivers"
+       depends on HW_CONSOLE
+       default n
+       ---help---
+         The virtual terminal is the device that interacts with the physical
+         terminal through console drivers. On these systems, at least one
+         console driver is loaded. In other configurations, additional console
+         drivers may be enabled, such as the framebuffer console. If more than
+         1 console driver is enabled, setting this to 'y' will allow you to
+         select the console driver that will serve as the backend for the
+         virtual terminals.
+
+        See <file:Documentation/console/console.txt> for more
+        information. For framebuffer console users, please refer to
+        <file:Documentation/fb/fbcon.txt>.
+

 config SERIAL_NONSTANDARD
        bool "Non-standard serial port support"
        ---help---
 config SERIAL_NONSTANDARD
        bool "Non-standard serial port support"
        ---help---


@@ -80,7 +97,7 @@ config SERIAL_NONSTANDARD
 
 config COMPUTONE
        tristate "Computone IntelliPort Plus serial support"
 
 config COMPUTONE
        tristate "Computone IntelliPort Plus serial support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD && (ISA || EISA || PCI)

        ---help---
          This driver supports the entire family of Intelliport II/Plus
          controllers with the exception of the MicroChannel controllers and
        ---help---
          This driver supports the entire family of Intelliport II/Plus
          controllers with the exception of the MicroChannel controllers and


@@ -138,7 +155,7 @@ config CYZ_INTR
 
 config DIGIEPCA
        tristate "Digiboard Intelligent Async Support"
 
 config DIGIEPCA
        tristate "Digiboard Intelligent Async Support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD

        ---help---
          This is a driver for Digi International's Xx, Xeve, and Xem series
          of cards which provide multiple serial ports. You would need
        ---help---
          This is a driver for Digi International's Xx, Xeve, and Xem series
          of cards which provide multiple serial ports. You would need


@@ -148,29 +165,12 @@ config DIGIEPCA
          you have a card like this, say Y here and read the file
          <file:Documentation/digiepca.txt>.
 
          you have a card like this, say Y here and read the file
          <file:Documentation/digiepca.txt>.
 

-         NOTE: There is another, separate driver for the Digiboard PC boards:
-         "Digiboard PC/Xx Support" below. You should (and can) only select
-         one of the two drivers.
-

          To compile this driver as a module, choose M here: the
          module will be called epca.
 
          To compile this driver as a module, choose M here: the
          module will be called epca.
 

-config DIGI
-       tristate "Digiboard PC/Xx Support"
-       depends on SERIAL_NONSTANDARD && DIGIEPCA=n && BROKEN_ON_SMP
-       help
-         This is a driver for the Digiboard PC/Xe, PC/Xi, and PC/Xeve cards
-         that give you many serial ports. You would need something like this
-         to connect more than two modems to your Linux box, for instance in
-         order to become a dial-in server. If you have a card like that, say
-         Y here and read the file <file:Documentation/digiboard.txt>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called pcxx.
-

 config ESPSERIAL
        tristate "Hayes ESP serial port support"
 config ESPSERIAL
        tristate "Hayes ESP serial port support"

-       depends on SERIAL_NONSTANDARD && ISA && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD && ISA && ISA_DMA_API

        help
          This is a driver which supports Hayes ESP serial ports.  Both single
          port cards and multiport cards are supported.  Make sure to read
        help
          This is a driver which supports Hayes ESP serial ports.  Both single
          port cards and multiport cards are supported.  Make sure to read


@@ -183,7 +183,7 @@ config ESPSERIAL
 
 config MOXA_INTELLIO
        tristate "Moxa Intellio support"
 
 config MOXA_INTELLIO
        tristate "Moxa Intellio support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD

        help
          Say Y here if you have a Moxa Intellio multiport serial card.
 
        help
          Say Y here if you have a Moxa Intellio multiport serial card.
 


@@ -192,7 +192,7 @@ config MOXA_INTELLIO
 
 config MOXA_SMARTIO
        tristate "Moxa SmartIO support"
 
 config MOXA_SMARTIO
        tristate "Moxa SmartIO support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD

        help
          Say Y here if you have a Moxa SmartIO multiport serial card.
 
        help
          Say Y here if you have a Moxa SmartIO multiport serial card.
 


@@ -201,9 +201,25 @@ config MOXA_SMARTIO
          The module will be called mxser. If you want to do that, say M
          here.
 
          The module will be called mxser. If you want to do that, say M
          here.
 

+config MOXA_SMARTIO_NEW
+       tristate "Moxa SmartIO support v. 2.0 (EXPERIMENTAL)"
+       depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
+       help
+         Say Y here if you have a Moxa SmartIO multiport serial card and/or
+         want to help develop a new version of this driver.
+
+         This is upgraded (1.9.1) driver from original Moxa drivers with
+         changes finally resulting in PCI probing.
+
+         Use at your own risk.
+
+         This driver can also be built as a module. The module will be called
+         mxser_new. If you want to do that, say M here.
+

 config ISI
        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
 config ISI
        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"

-       depends on SERIAL_NONSTANDARD && PCI && EXPERIMENTAL && BROKEN_ON_SMP && m
+       depends on SERIAL_NONSTANDARD && PCI
+       select FW_LOADER

        help
          This is a driver for the Multi-Tech cards which provide several
          serial ports.  The driver is experimental and can currently only be
        help
          This is a driver for the Multi-Tech cards which provide several
          serial ports.  The driver is experimental and can currently only be


@@ -212,7 +228,7 @@ config ISI
 
 config SYNCLINK
        tristate "Microgate SyncLink card support"
 
 config SYNCLINK
        tristate "Microgate SyncLink card support"

-       depends on SERIAL_NONSTANDARD && PCI
+       depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API

        help
          Provides support for the SyncLink ISA and PCI multiprotocol serial
          adapters. These adapters support asynchronous and HDLC bit
        help
          Provides support for the SyncLink ISA and PCI multiprotocol serial
          adapters. These adapters support asynchronous and HDLC bit


@@ -237,6 +253,14 @@ config SYNCLINKMP
          The module will be called synclinkmp.  If you want to do that, say M
          here.
 
          The module will be called synclinkmp.  If you want to do that, say M
          here.
 

+config SYNCLINK_GT
+       tristate "SyncLink GT/AC support"
+       depends on SERIAL_NONSTANDARD && PCI
+       help
+         Support for SyncLink GT and SyncLink AC families of
+         synchronous and asynchronous serial adapters
+         manufactured by Microgate Systems, Ltd. (www.microgate.com)
+

 config N_HDLC
        tristate "HDLC line discipline support"
        depends on SERIAL_NONSTANDARD
 config N_HDLC
        tristate "HDLC line discipline support"
        depends on SERIAL_NONSTANDARD


@@ -264,7 +288,7 @@ config RISCOM8
 
 config SPECIALIX
        tristate "Specialix IO8+ card support"
 
 config SPECIALIX
        tristate "Specialix IO8+ card support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       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
        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


@@ -288,7 +312,7 @@ config SPECIALIX_RTSCTS
 
 config SX
        tristate "Specialix SX (and SI) card support"
 
 config SX
        tristate "Specialix SX (and SI) card support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)

        help
          This is a driver for the SX and SI multiport serial cards.
          Please read the file <file:Documentation/sx.txt> for details.
        help
          This is a driver for the SX and SI multiport serial cards.
          Please read the file <file:Documentation/sx.txt> for details.


@@ -299,7 +323,7 @@ config SX
 
 config RIO
        tristate "Specialix RIO system support"
 
 config RIO
        tristate "Specialix RIO system support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD

        help
          This is a driver for the Specialix RIO, a smart serial card which
          drives an outboard box that can support up to 128 ports.  Product
        help
          This is a driver for the Specialix RIO, a smart serial card which
          drives an outboard box that can support up to 128 ports.  Product


@@ -348,22 +372,6 @@ config ISTALLION
          To compile this driver as a module, choose M here: the
          module will be called istallion.
 
          To compile this driver as a module, choose M here: the
          module will be called istallion.
 

-config SERIAL_TX3912
-       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;
-         see <http://www.toshiba.com/taec/components/Generic/risc/tx3912.htm>.
-         Say Y here to enable kernel support for the on-board serial port.
-
-config SERIAL_TX3912_CONSOLE
-       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;
-         see <http://www.toshiba.com/taec/components/Generic/risc/tx3912.htm>.
-         Say Y here to direct console I/O to the on-board serial port.
-

 config AU1000_UART
        bool "Enable Au1000 UART Support"
        depends on SERIAL_NONSTANDARD && MIPS
 config AU1000_UART
        bool "Enable Au1000 UART Support"
        depends on SERIAL_NONSTANDARD && MIPS


@@ -378,36 +386,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


@@ -432,6 +410,20 @@ config SGI_SNSC
          controller communication from user space (you want this!),
          say Y.  Otherwise, say N.
 
          controller communication from user space (you want this!),
          say Y.  Otherwise, say N.
 

+config SGI_TIOCX
+       bool "SGI TIO CX driver support"
+       depends on (IA64_SGI_SN2 || IA64_GENERIC)
+       help
+         If you have an SGI Altix and you have fpga devices attached
+         to your TIO, say Y here, otherwise say N.
+
+config SGI_MBCS
+       tristate "SGI FPGA Core Services driver support"
+       depends on SGI_TIOCX
+       help
+         If you have an SGI Altix with an attached SABrick
+         say Y or M here, otherwise say N.
+

 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS
 source "drivers/serial/Kconfig"
 
 config UNIX98_PTYS


@@ -474,10 +466,13 @@ config LEGACY_PTYS
          security.  This option enables these legacy devices; on most
          systems, it is safe to say N.
 
          security.  This option enables these legacy devices; on most
          systems, it is safe to say N.
 

+config CRASH
+        tristate "Crash Utility memory driver"

 
 config LEGACY_PTY_COUNT
        int "Maximum number of legacy PTY in use"
        depends on LEGACY_PTYS
 
 config LEGACY_PTY_COUNT
        int "Maximum number of legacy PTY in use"
        depends on LEGACY_PTYS

+       range 1 256

        default "256"
        ---help---
          The maximum number of legacy PTYs that can be used at any one time.
        default "256"
        ---help---
          The maximum number of legacy PTYs that can be used at any one time.


@@ -487,6 +482,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.
 
          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
 config PRINTER
        tristate "Parallel printer support"
        depends on PARPORT


@@ -570,14 +580,38 @@ config TIPAR
 
          If unsure, say N.
 
 
          If unsure, say N.
 

+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.
+         It will automatically be selected if one of the back-end console drivers
+         is selected.
+
+

 config HVC_CONSOLE
        bool "pSeries Hypervisor Virtual Console support"
        depends on PPC_PSERIES
 config HVC_CONSOLE
        bool "pSeries Hypervisor Virtual Console support"
        depends on PPC_PSERIES

+       select HVC_DRIVER

        help
          pSeries machines when partitioned support a hypervisor virtual
          console. This driver allows each pSeries partition to have a console
          which is accessed via the HMC.
 
        help
          pSeries machines when partitioned support a hypervisor virtual
          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
+       select HVC_DRIVER
+       help
+         IBM Console device driver which makes use of RTAS
+

 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES


@@ -662,24 +696,11 @@ config NWFLASH
 
          If you're not sure, say N.
 
 
          If you're not sure, say N.
 

-config HW_RANDOM
-       tristate "Intel/AMD/VIA HW Random Number Generator support"
-       depends on (X86 || IA64) && PCI
-       ---help---
-         This driver provides kernel-side support for the Random Number
-         Generator hardware found on Intel i8xx-based motherboards,
-         AMD 76x-based motherboards, and Via Nehemiah CPUs.
-
-         Provides a character driver, used to read() entropy data.
-
-         To compile this driver as a module, choose M here: the
-         module will be called hw_random.
-
-         If unsure, say N.
+source "drivers/char/hw_random/Kconfig"

 
 config NVRAM
        tristate "/dev/nvram support"
 
 config NVRAM
        tristate "/dev/nvram support"

-       depends on ATARI || X86 || X86_64 || ARM || GENERIC_NVRAM
+       depends on ATARI || X86 || ARM || GENERIC_NVRAM

        ---help---
          If you say Y here and create a character special file /dev/nvram
          with major number 10 and minor number 144 using mknod ("man mknod"),
        ---help---
          If you say Y here and create a character special file /dev/nvram
          with major number 10 and minor number 144 using mknod ("man mknod"),


@@ -705,7 +726,7 @@ config NVRAM
 
 config RTC
        tristate "Enhanced Real Time Clock Support"
 
 config RTC
        tristate "Enhanced Real Time Clock Support"

-       depends on !PPC32 && !PARISC && !IA64 && !M68K
+       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


@@ -753,7 +774,7 @@ config SGI_IP27_RTC
 
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
 
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"

-       depends on RTC!=y && !IA64 && !ARM
+       depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV

        ---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


@@ -780,6 +801,15 @@ config EFI_RTC
        bool "EFI Real Time Clock Services"
        depends on IA64
 
        bool "EFI Real Time Clock Services"
        depends on IA64
 

+config DS1302
+       tristate "DS1302 RTC support"
+       depends on M32R && (PLAT_M32700UT || PLAT_OPSPUT)
+       help
+         If you say Y here and create a character special file /dev/rtc with
+         major number 121 and minor number 0 using mknod ("man mknod"), you
+         will get access to the real time clock (or hardware clock) built
+         into your computer.
+

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


@@ -826,7 +856,7 @@ config APPLICOM
 
 config SONYPI
        tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
 
 config SONYPI
        tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && X86 && PCI && !64BIT
+       depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT

        ---help---
          This driver enables access to the Sony Programmable I/O Control
          Device which can be found in many (all ?) Sony Vaio laptops.
        ---help---
          This driver enables access to the Sony Programmable I/O Control
          Device which can be found in many (all ?) Sony Vaio laptops.


@@ -837,49 +867,10 @@ config SONYPI
          To compile this driver as a module, choose M here: the
          module will be called sonypi.
 
          To compile this driver as a module, choose M here: the
          module will be called sonypi.
 

-
-menu "Ftape, the floppy tape device driver"
-
-config FTAPE
-       tristate "Ftape (QIC-80/Travan) support"
-       depends on BROKEN_ON_SMP && (ALPHA || X86)
-       ---help---
-         If you have a tape drive that is connected to your floppy
-         controller, say Y here.
-
-         Some tape drives (like the Seagate "Tape Store 3200" or the Iomega
-         "Ditto 3200" or the Exabyte "Eagle TR-3") come with a "high speed"
-         controller of their own. These drives (and their companion
-         controllers) are also supported if you say Y here.
-
-         If you have a special controller (such as the CMS FC-10, FC-20,
-         Mountain Mach-II, or any controller that is based on the Intel 82078
-         FDC like the high speed controllers by Seagate and Exabyte and
-         Iomega's "Ditto Dash") you must configure it by selecting the
-         appropriate entries from the "Floppy tape controllers" sub-menu
-         below and possibly modify the default values for the IRQ and DMA
-         channel and the IO base in ftape's configuration menu.
-
-         If you want to use your floppy tape drive on a PCI-bus based system,
-         please read the file <file:drivers/char/ftape/README.PCI>.
-
-         The ftape kernel driver is also available as a runtime loadable
-         module. To compile this driver as a module, choose M here: the
-         module will be called ftape.
-
-         Note that the Ftape-HOWTO is out of date (sorry) and documents the
-         older version 2.08 of this software but still contains useful
-         information.  There is a web page with more recent documentation at
-         <http://www.instmath.rwth-aachen.de/~heine/ftape/>.  This page
-         always contains the latest release of the ftape driver and useful
-         information (backup software, ftape related patches and
-         documentation, FAQ).  Note that the file system interface has
-         changed quite a bit compared to previous versions of ftape.  Please
-         read <file:Documentation/ftape.txt>.
-
-source "drivers/char/ftape/Kconfig"
-
-endmenu
+config TANBAC_TB0219
+       tristate "TANBAC TB0219 base board support"
+       depends on TANBAC_TB022X
+       select GPIO_VR41XX

 
 source "drivers/char/agp/Kconfig"
 
 
 source "drivers/char/agp/Kconfig"
 


@@ -916,23 +907,70 @@ config MWAVE
 config SCx200_GPIO
        tristate "NatSemi SCx200 GPIO Support"
        depends on SCx200
 config SCx200_GPIO
        tristate "NatSemi SCx200 GPIO Support"
        depends on SCx200

+       select NSC_GPIO

        help
          Give userspace access to the GPIO pins on the National
          Semiconductor SCx200 processors.
 
          If compiled as a module, it will be called scx200_gpio.
 
        help
          Give userspace access to the GPIO pins on the National
          Semiconductor SCx200 processors.
 
          If compiled as a module, it will be called scx200_gpio.
 

+config PC8736x_GPIO
+       tristate "NatSemi PC8736x GPIO Support"
+       depends on X86
+       default SCx200_GPIO     # mostly N
+       select NSC_GPIO         # needed for support routines
+       help
+         Give userspace access to the GPIO pins on the National
+         Semiconductor PC-8736x (x=[03456]) SuperIO chip.  The chip
+         has multiple functional units, inc several managed by
+         hwmon/pc87360 driver.  Tested with PC-87366
+
+         If compiled as a module, it will be called pc8736x_gpio.
+
+config NSC_GPIO
+       tristate "NatSemi Base GPIO Support"
+       depends on X86_32
+       # selected by SCx200_GPIO and PC8736x_GPIO
+       # what about 2 selectors differing: m != y
+       help
+         Common support used (and needed) by scx200_gpio and
+         pc8736x_gpio drivers.  If those drivers are built as
+         modules, this one will be too, named nsc_gpio
+
+config CS5535_GPIO
+       tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
+       depends on X86_32
+       help
+         Give userspace access to the GPIO pins on the AMD CS5535 and
+         CS5536 Geode companion devices.
+
+         If compiled as a module, it will be called cs5535_gpio.
+
+config GPIO_VR41XX
+       tristate "NEC VR4100 series General-purpose I/O Unit support"
+       depends on CPU_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. 
          See the raw(8) manpage for more details.
 
        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. 
          See the raw(8) manpage for more details.
 

-          The raw driver is deprecated and may be removed from 2.7
-          kernels.  Applications should simply open the device (eg /dev/hda1)
+          The raw driver is deprecated and will be removed soon.
+          Applications should simply open the device (eg /dev/hda1)

           with the O_DIRECT flag.
 
           with the O_DIRECT flag.
 

+config MAX_RAW_DEVS
+       int "Maximum number of RAW devices to support (1-8192)"
+       depends on RAW_DRIVER
+       default "256"
+       help
+         The maximum number of RAW devices that are supported.
+         Default is 256. Increase this number in case you need lots of
+         raw devices.
+

 config HPET
        bool "HPET - High Precision Event Timer" if (X86 || IA64)
        default n
 config HPET
        bool "HPET - High Precision Event Timer" if (X86 || IA64)
        default n


@@ -940,7 +978,7 @@ config HPET
        help
          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
        help
          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.
+         non-periodic and/or periodic.

 
 config HPET_RTC_IRQ
        bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC
 
 config HPET_RTC_IRQ
        bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC


@@ -964,18 +1002,9 @@ config HPET_MMAP
          exposed to the user.  If this applies to your hardware,
          say N here.
 
          exposed to the user.  If this applies to your hardware,
          say N here.
 

-config MAX_RAW_DEVS
-       int "Maximum number of RAW devices to support (1-8192)"
-       depends on RAW_DRIVER
-       default "256"
-       help
-         The maximum number of RAW devices that are supported.
-         Default is 256. Increase this number in case you need lots of
-         raw devices.
-

 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"

-       depends on X86_64 || X86
+       depends on X86 || IA64 || PPC64

        help
          The hangcheck-timer module detects when the system has gone
          out to lunch past a certain margin.  It can reboot the system
        help
          The hangcheck-timer module detects when the system has gone
          out to lunch past a certain margin.  It can reboot the system


@@ -989,5 +1018,19 @@ config MMTIMER
          The mmtimer device allows direct userspace access to the
          Altix system timer.
 
          The mmtimer device allows direct userspace access to the
          Altix system timer.
 

+source "drivers/char/tpm/Kconfig"
+
+config TELCLOCK
+       tristate "Telecom clock driver for MPBL0010 ATCA SBC"
+       depends on EXPERIMENTAL && X86
+       default n
+       help
+         The telecom clock device is specific to the MPBL0010 ATCA computer and
+         allows direct userspace access to the configuration of the telecom clock
+         configuration settings.  This device is used for hardware synchronization
+         across the ATCA backplane fabric.  Upon loading, the driver exports a
+         sysfs directory, /sys/devices/platform/telco_clock, with a number of
+         files for controlling the behavior of this hardware.
+

 endmenu
 
 endmenu