Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

[pandora-kernel.git] / drivers / uio / Kconfig

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index a4aaab9..4190be6 100644 (file)
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -15,7 +15,7 @@ if UIO
 
 config UIO_CIF
        tristate "generic Hilscher CIF Card driver"
-       depends on UIO && PCI
+       depends on PCI
        default n
        help
          Driver for Hilscher CIF DeviceNet and Profibus cards.  This
@@ -26,9 +26,28 @@ config UIO_CIF
          To compile this driver as a module, choose M here: the module
          will be called uio_cif.
 
+config UIO_PDRV
+       tristate "Userspace I/O platform driver"
+       help
+         Generic platform driver for Userspace I/O devices.
+
+         If you don't know what to do here, say N.
+
+config UIO_PDRV_GENIRQ
+       tristate "Userspace I/O platform driver with generic IRQ handling"
+       help
+         Platform driver for Userspace I/O devices, including generic
+         interrupt handling code. Shared interrupts are not supported.
+
+         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_SMX
        tristate "SMX cryptengine UIO interface"
-       depends on UIO
        default n
        help
          Userspace IO interface to the Cryptography engine found on the