ACPI hibernation: Call _PTS before suspending devices

[safe/jmp/linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 970f70d..4666295 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -6,6 +6,7 @@ menu "Character devices"
 
 config VT
        bool "Virtual terminal" if EMBEDDED
 
 config VT
        bool "Virtual terminal" if EMBEDDED

+       depends on !S390

        select INPUT
        default y if !VIOCONS
        ---help---
        select INPUT
        default y if !VIOCONS
        ---help---


@@ -62,8 +63,26 @@ config HW_CONSOLE
        depends on VT && !S390 && !UML
        default y
 
        depends on VT && !S390 && !UML
        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"
 config SERIAL_NONSTANDARD
        bool "Non-standard serial port support"

+       depends on HAS_IOMEM

        ---help---
          Say Y here if you have any non-standard serial boards -- boards
          which aren't supported using the standard "dumb" serial driver.
        ---help---
          Say Y here if you have any non-standard serial boards -- boards
          which aren't supported using the standard "dumb" serial driver.


@@ -80,7 +99,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


@@ -95,7 +114,7 @@ config COMPUTONE
 
 config ROCKETPORT
        tristate "Comtrol RocketPort support"
 
 config ROCKETPORT
        tristate "Comtrol RocketPort support"

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

        help
          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or
        help
          This driver supports Comtrol RocketPort and RocketModem PCI boards.   
           These boards provide 2, 4, 8, 16, or 32 high-speed serial ports or


@@ -110,14 +129,15 @@ config ROCKETPORT
 
 config CYCLADES
        tristate "Cyclades async mux support"
 
 config CYCLADES
        tristate "Cyclades async mux support"

-       depends on SERIAL_NONSTANDARD
+       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
          your Linux box, for instance in order to become a dial-in server.
 
          For information about the Cyclades-Z card, read
        ---help---
          This driver supports Cyclades Z and Y multiserial boards.
          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.
 
          For information about the Cyclades-Z card, read

-         <file:drivers/char/README.cycladesZ>.
+         <file:Documentation/README.cycladesZ>.

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


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

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

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


@@ -153,7 +173,7 @@ config DIGIEPCA
 
 config ESPSERIAL
        tristate "Hayes ESP serial port support"
 
 config ESPSERIAL
        tristate "Hayes ESP serial port support"

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


@@ -166,7 +186,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 && (ISA || EISA || PCI)

        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.
 


@@ -174,7 +194,7 @@ config MOXA_INTELLIO
          module will be called moxa.
 
 config MOXA_SMARTIO
          module will be called moxa.
 
 config MOXA_SMARTIO

-       tristate "Moxa SmartIO support"
+       tristate "Moxa SmartIO support (OBSOLETE)"

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


@@ -184,9 +204,23 @@ 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"
+       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.
+
+         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
+       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


@@ -208,7 +242,7 @@ config SYNCLINK
 
 config SYNCLINKMP
        tristate "SyncLink Multiport support"
 
 config SYNCLINKMP
        tristate "SyncLink Multiport support"

-       depends on SERIAL_NONSTANDARD
+       depends on SERIAL_NONSTANDARD && PCI

        help
          Enable support for the SyncLink Multiport (2 or 4 ports)
          serial adapter, running asynchronous and HDLC communications up
        help
          Enable support for the SyncLink Multiport (2 or 4 ports)
          serial adapter, running asynchronous and HDLC communications up


@@ -220,6 +254,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


@@ -271,7 +313,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
+       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.


@@ -282,7 +324,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


@@ -311,7 +353,7 @@ config STALDRV
 
 config STALLION
        tristate "Stallion EasyIO or EC8/32 support"
 
 config STALLION
        tristate "Stallion EasyIO or EC8/32 support"

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

        help
          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
          card, then this is for you; say Y.  Make sure to read
        help
          If you have an EasyIO or EasyConnection 8/32 multiport Stallion
          card, then this is for you; say Y.  Make sure to read


@@ -322,7 +364,7 @@ config STALLION
 
 config ISTALLION
        tristate "Stallion EC8/64, ONboard, Brumby support"
 
 config ISTALLION
        tristate "Stallion EC8/64, ONboard, Brumby support"

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

        help
          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
          serial multiport card, say Y here. Make sure to read
        help
          If you have an EasyConnection 8/64, ONboard, Brumby or Stallion
          serial multiport card, say Y here. Make sure to read


@@ -331,49 +373,15 @@ 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 AU1000_UART
-       bool "Enable Au1000 UART Support"
-       depends on SERIAL_NONSTANDARD && MIPS
-       help
-         If you have an Alchemy AU1000 processor (MIPS based) and you want
-         to use serial ports, say Y.  Otherwise, say N.
-
-config AU1000_SERIAL_CONSOLE
-       bool "Enable Au1000 serial console"
-       depends on AU1000_UART
-       help
-         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
+config NOZOMI
+       tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
+       depends on PCI && EXPERIMENTAL

        help
        help

-         Images of Qtronix keyboards are at
-         <http://www.qtronix.com/keyboard.html>.
+         If you have a HSDPA driver Broadband Wireless Data Card -
+         Globe Trotter PCMCIA card, say Y here.

 
 

-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>.
+         To compile this driver as a module, choose M here, the module
+         will be called nozomi.

 
 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
 
 config A2232
        tristate "Commodore A2232 serial support (EXPERIMENTAL)"


@@ -459,7 +467,7 @@ config LEGACY_PTYS
 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
+       range 0 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.


@@ -469,6 +477,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


@@ -530,36 +553,58 @@ config PPDEV
 
          If unsure, say N.
 
 
          If unsure, say N.
 

-config TIPAR
-       tristate "Texas Instruments parallel link cable support"
-       depends on PARPORT
-       ---help---
-         If you own a Texas Instruments graphing calculator and use a
-         parallel link cable, then you might be interested in this driver.
-
-         If you enable this driver, you will be able to communicate with
-         your calculator through a set of device nodes under /dev. The
-         main advantage of this driver is that you don't have to be root
-         to use this precise link cable (depending on the permissions on
-         the device nodes, though).
-
-         To compile this driver as a module, choose M here: the
-         module will be called tipar.
-
-         If you don't know what a parallel link cable is or what a Texas
-         Instruments graphing calculator is, then you probably don't need this
-         driver.
+config HVC_DRIVER
+       bool
+       help
+         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.

 
 

-         If unsure, say N.

 
 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
+       default y
+       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 HVC_BEAT
+       bool "Toshiba's Beat Hypervisor Console support"
+       depends on PPC_CELLEB
+       select HVC_DRIVER
+       help
+         Toshiba's Cell Reference Set Beat Console device driver
+
+config HVC_XEN
+       bool "Xen Hypervisor Console support"
+       depends on XEN
+       select HVC_DRIVER
+       default y
+       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
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES


@@ -579,8 +624,6 @@ config HVCS
 
 source "drivers/char/ipmi/Kconfig"
 
 
 source "drivers/char/ipmi/Kconfig"
 

-source "drivers/char/watchdog/Kconfig"
-

 config DS1620
        tristate "NetWinder thermometer support"
        depends on ARCH_NETWINDER
 config DS1620
        tristate "NetWinder thermometer support"
        depends on ARCH_NETWINDER


@@ -644,20 +687,7 @@ 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"


@@ -687,7 +717,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 && !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
        ---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


@@ -711,6 +741,28 @@ config RTC
          To compile this driver as a module, choose M here: the
          module will be called 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
 config SGI_DS1286
        tristate "SGI DS1286 RTC support"
        depends on SGI_IP22


@@ -735,7 +787,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 && !M32R && !SPARC32 && !SPARC64
+       depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !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


@@ -771,18 +823,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 RTC_VR41XX
-       tristate "NEC VR4100 series Real Time Clock Support"
-       depends on CPU_VR41XX
-

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


@@ -792,6 +832,7 @@ config COBALT_LCD
 
 config DTLK
        tristate "Double Talk PC internal speech card support"
 
 config DTLK
        tristate "Double Talk PC internal speech card support"

+       depends on ISA

        help
          This driver is for the DoubleTalk PC, a speech synthesizer
          manufactured by RC Systems (<http://www.rcsys.com/>).  It is also
        help
          This driver is for the DoubleTalk PC, a speech synthesizer
          manufactured by RC Systems (<http://www.rcsys.com/>).  It is also


@@ -840,56 +881,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.
 

-config TANBAC_TB0219
-       tristate "TANBAC TB0219 base board support"
-       depends TANBAC_TB022X
-
-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
-
-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
+config GPIO_TB0219
+       tristate "TANBAC TB0219 GPIO support"
+       depends on TANBAC_TB022X
+       select GPIO_VR41XX

 
 source "drivers/char/pcmcia/Kconfig"
 
 
 source "drivers/char/pcmcia/Kconfig"
 


@@ -922,27 +917,69 @@ 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
 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)"
+       tristate "RAW driver (/dev/raw/rawN)"
+       depends on BLOCK

        help
        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. 
+         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.
 
          See the raw(8) manpage for more details.
 

-          The raw driver is deprecated and will be removed soon.
-          Applications should simply open the device (eg /dev/hda1)
+          Applications should preferably 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


@@ -950,7 +987,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


@@ -974,18 +1011,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 || IA64 || PPC64 || ARCH_S390
+       depends on X86 || IA64 || PPC64 || S390

        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


@@ -1002,16 +1030,25 @@ config MMTIMER
 source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK
 source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK

-       tristate "Telecom clock driver for MPBL0010 ATCA SBC"
-       depends on EXPERIMENTAL
+       tristate "Telecom clock driver for ATCA SBC"
+       depends on EXPERIMENTAL && X86

        default n
        help
        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.
+         The telecom clock device is specific to the MPCBL0010 and MPCBL0050
+         ATCA computers 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.
+
+config DEVPORT
+       bool
+       depends on !M68K
+       depends on ISA || PCI
+       default y
+
+source "drivers/s390/char/Kconfig"

 
 endmenu
 
 
 endmenu