Remove inclusions of <linux/autoconf.h>

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7152500..eb5687b 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---


@@ -113,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


@@ -129,13 +130,14 @@ config ROCKETPORT
 config CYCLADES
        tristate "Cyclades async mux support"
        depends on SERIAL_NONSTANDARD && (PCI || ISA)
 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
          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.


@@ -156,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


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

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


@@ -212,8 +214,6 @@ config MOXA_SMARTIO_NEW
          This is upgraded (1.9.1) driver from original Moxa drivers with
          changes finally resulting in PCI probing.
 
          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.
 
          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.
 


@@ -242,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


@@ -276,7 +276,7 @@ config N_HDLC
 
 config RISCOM8
        tristate "SDL RISCom/8 card support"
 
 config RISCOM8
        tristate "SDL RISCom/8 card support"

-       depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD

        help
          This is a driver for the SDL Communications RISCom/8 multiport card,
          which gives you many serial ports. You would need something like
        help
          This is a driver for the SDL Communications RISCom/8 multiport card,
          which gives you many serial ports. You would need something like


@@ -353,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


@@ -364,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


@@ -373,52 +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
+config NOZOMI
+       tristate "HSDPA Broadband Wireless Data Card - Globe Trotter"
+       depends on PCI && EXPERIMENTAL

        help
        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.
+         If you have a HSDPA driver Broadband Wireless Data Card -
+         Globe Trotter PCMCIA card, say Y here.

 
 

-config SERIAL_DEC
-       bool "DECstation serial support"
-       depends on MACH_DECSTATION
-       default y
-       help
-         This selects whether you want to be asked about drivers for
-         DECstation serial ports.
-
-         Note that the answer to this question won't directly affect the
-         kernel: saying N will just cause the configurator to skip all
-         the questions about DECstation serial ports.
-
-config SERIAL_DEC_CONSOLE
-       bool "Support for console on a DECstation serial port"
-       depends on SERIAL_DEC
-       default y
-       help
-         If you say Y here, it will be possible to use a serial port as the
-         system console (the system console is the device which receives all
-         kernel messages and warnings and which allows logins in single user
-         mode).  Note that the firmware uses ttyS0 as the serial console on
-         the Maxine and ttyS2 on the others.
-
-         If unsure, say Y.
-
-config ZS
-       bool "Z85C30 Serial Support"
-       depends on SERIAL_DEC
-       default y
-       help
-         Documentation on the Zilog 85C350 serial communications controller
-         is downloadable at <http://www.zilog.com/pdfs/serial/z85c30.pdf>
+         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)"


@@ -504,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.


@@ -590,33 +553,11 @@ 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.
-
-         If unsure, say N.
-

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


@@ -652,6 +593,18 @@ config HVC_BEAT
        help
          Toshiba's Cell Reference Set Beat Console device 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


@@ -671,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


@@ -766,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 && !SUPERH
+       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


@@ -790,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


@@ -814,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 && !SPARC && !FRV
+       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


@@ -913,10 +886,6 @@ config GPIO_TB0219
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 
        depends on TANBAC_TB022X
        select GPIO_VR41XX
 

-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
-

 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE
 source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE


@@ -992,15 +961,14 @@ config GPIO_VR41XX
        depends on CPU_VR41XX
 
 config RAW_DRIVER
        depends on CPU_VR41XX
 
 config RAW_DRIVER

-       tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
+       tristate "RAW driver (/dev/raw/rawN)"

        depends on BLOCK
        help
        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. 
+         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.
 
 config MAX_RAW_DEVS
           with the O_DIRECT flag.
 
 config MAX_RAW_DEVS


@@ -1045,7 +1013,7 @@ config HPET_MMAP
 
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
 
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"

-       depends on X86 || IA64 || PPC64
+       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


@@ -1080,5 +1048,7 @@ config DEVPORT
        depends on ISA || PCI
        default y
 
        depends on ISA || PCI
        default y
 

+source "drivers/s390/char/Kconfig"
+

 endmenu
 
 endmenu