This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index d86e52e..f9e31a5 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -203,7 +203,7 @@ config MOXA_SMARTIO
 
 config ISI
        tristate "Multi-Tech multiport card support (EXPERIMENTAL)"
-       depends on SERIAL_NONSTANDARD && PCI && EXPERIMENTAL && BROKEN_ON_SMP && m
+       depends on SERIAL_NONSTANDARD && EXPERIMENTAL && BROKEN_ON_SMP && m
        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 +212,7 @@ config ISI
 
 config SYNCLINK
        tristate "Microgate SyncLink card support"
-       depends on SERIAL_NONSTANDARD && PCI
+       depends on SERIAL_NONSTANDARD
        help
          Provides support for the SyncLink ISA and PCI multiprotocol serial
          adapters. These adapters support asynchronous and HDLC bit
@@ -371,6 +371,22 @@ config AU1000_UART
          If you have an Alchemy AU1000 processor (MIPS based) and you want
          to use serial ports, say Y.  Otherwise, say N.
 
+config SGI_L1_SERIAL
+       bool "SGI Altix L1 serial support"
+       depends on SERIAL_NONSTANDARD && IA64 && DISCONTIGMEM
+       help
+         If you have an SGI Altix and you want to use the serial port
+         connected to the system controller (you want this!), say Y.
+         Otherwise, say N.
+
+config SGI_L1_SERIAL_CONSOLE
+       bool "SGI Altix L1 serial console support"
+       depends on SGI_L1_SERIAL
+       help
+         If you have an SGI Altix and you would like to use the system
+         controller serial port as your console (you want this!),
+         say Y.  Otherwise, say N.
+
 config AU1000_SERIAL_CONSOLE
        bool "Enable Au1000 serial console"
        depends on AU1000_UART
@@ -572,23 +588,6 @@ config HVC_CONSOLE
          console. This driver allows each pSeries partition to have a console
          which is accessed via the HMC.
 
-config HVCS
-       tristate "IBM Hypervisor Virtual Console Server support"
-       depends on PPC_PSERIES
-       help
-         Partitionable IBM Power5 ppc64 machines allow hosting of
-         firmware virtual consoles from one Linux partition by
-         another Linux partition.  This driver allows console data
-         from Linux partitions to be accessed through TTY device
-         interfaces in the device tree of a Linux partition running
-         this driver.
-
-         To compile this driver as a module, choose M here: the
-         module will be called hvcs.ko.  Additionally, this module
-         will depend on arch specific APIs exported from hvcserver.ko
-         which will also be compiled when this driver is built as a
-         module.
-
 config QIC02_TAPE
        tristate "QIC-02 tape support"
        help
@@ -838,7 +837,6 @@ config R3964
 
 config APPLICOM
        tristate "Applicom intelligent fieldbus card support"
-       depends on PCI
        ---help---
          This driver provides the kernel-side support for the intelligent
          fieldbus cards made by Applicom International. More information
@@ -869,7 +867,7 @@ menu "Ftape, the floppy tape device driver"
 
 config FTAPE
        tristate "Ftape (QIC-80/Travan) support"
-       depends on BROKEN_ON_SMP && (ALPHA || X86)
+       depends on BROKEN_ON_SMP
        ---help---
          If you have a tape drive that is connected to your floppy
          controller, say Y here.
@@ -978,18 +976,14 @@ config HPET_RTC_IRQ
          is assumed the platform called hpet_alloc with the RTC IRQ values for
          the HPET timers.
 
-config HPET_MMAP
-       bool "Allow mmap of HPET"
-       default y
+config HPET_NOMMAP
+       bool "HPET - Control mmap capability."
+       default n
        depends on HPET
        help
-         If you say Y here, user applications will be able to mmap
-         the HPET registers.
-
-         In some hardware implementations, the page containing HPET
-         registers may also contain other things that shouldn't be
-         exposed to the user.  If this applies to your hardware,
-         say N here.
+         If you say Y here, then the mmap interface for the HPET driver returns ENOSYS.
+         Some hardware implementations might not want all the memory in the page the
+         HPET control registers reside to be exposed.
 
 config MAX_RAW_DEVS
        int "Maximum number of RAW devices to support (1-8192)"