Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 2e9079d..1da73ec 100644 (file)
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -1,7 +1,6 @@
 menuconfig UIO
        tristate "Userspace I/O drivers"
        depends on !S390
-       default n
        help
          Enable this to allow the userspace driver core code to be
          built.  This code allows userspace programs easy access to
@@ -16,7 +15,6 @@ if UIO
 config UIO_CIF
        tristate "generic Hilscher CIF Card driver"
        depends on PCI
-       default n
        help
          Driver for Hilscher CIF DeviceNet and Profibus cards.  This
          driver requires a userspace component that handles all of the
@@ -33,16 +31,67 @@ config UIO_PDRV
 
          If you don't know what to do here, say N.
 
-config UIO_SMX
-       tristate "SMX cryptengine UIO interface"
-       default n
+config UIO_PDRV_GENIRQ
+       tristate "Userspace I/O platform driver with generic IRQ handling"
        help
-         Userspace IO interface to the Cryptography engine found on the
-         Nias Digital SMX boards.  These will be available from Q4 2008
-         from http://www.niasdigital.com.  The userspace part of this
-         driver will be released under the GPL at the same time as the
-         hardware and will be able to be downloaded from the same site.
+         Platform driver for Userspace I/O devices, including generic
+         interrupt handling code. Shared interrupts are not supported.
 
-         If you compile this as a module, it will be called uio_smx.
+         This kernel driver requires that the matching userspace driver
+         handles interrupts in a special way. Userspace is responsible
+         for acknowledging the hardware device if needed, and re-enabling
+         interrupts in the interrupt controller using the write() syscall.
+
+         If you don't know what to do here, say N.
+
+config UIO_AEC
+       tristate "AEC video timestamp device"
+       depends on PCI
+       help
+
+         UIO driver for the Adrienne Electronics Corporation PCI time
+         code device.
+
+         This device differs from other UIO devices since it uses I/O
+         ports instead of memory mapped I/O. In order to make it
+         possible for UIO to work with this device a utility, uioport,
+         can be used to read and write the ports:
+
+           git clone git://ifup.org/philips/uioport.git
+
+         If you compile this as a module, it will be called uio_aec.
+
+config UIO_SERCOS3
+       tristate "Automata Sercos III PCI card driver"
+       depends on PCI
+       help
+         Userspace I/O interface for the Sercos III PCI card from
+         Automata GmbH. The userspace part of this driver will be
+         available for download from the Automata GmbH web site.
+
+         Automata GmbH:        http://www.automataweb.com
+         Sercos III interface: http://www.sercos.com
+
+         If you compile this as a module, it will be called uio_sercos3.
+
+config UIO_PCI_GENERIC
+       tristate "Generic driver for PCI 2.3 and PCI Express cards"
+       depends on PCI
+       help
+         Generic driver that you can bind, dynamically, to any
+         PCI 2.3 compliant and PCI Express card. It is useful,
+         primarily, for virtualization scenarios.
+         If you compile this as a module, it will be called uio_pci_generic.
+
+config UIO_NETX
+       tristate "Hilscher NetX Card driver"
+       depends on PCI
+       help
+         Driver for Hilscher NetX based fieldbus cards (cifX, comX).
+         This driver requires a userspace component that comes with the card
+         or is available from Hilscher (http://www.hilscher.com).
+
+         To compile this driver as a module, choose M here; the module
+         will be called uio_netx.
 
 endif