ipsec: Fix deadlock in xfrm_state management.

[linux-2.6] / drivers / uio / Kconfig

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index d8ab7e668bd21656aaff86b8a028ec9df98147c5..2e9079df26b3a2ebd67e633295167389d380ae81 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,4 +26,23 @@ 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_SMX
+       tristate "SMX cryptengine UIO interface"
+       default n
+       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.
+
+         If you compile this as a module, it will be called uio_smx.
+
 endif