Merge commit 'v2.6.26' into bkl-removal

[linux-2.6] / drivers / uio / Kconfig

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 6b1a62d45e46b5d1dee753ac263843a63d6aa2e4..a4aaab9c7ddcd3f1a5546175a262ad0b84310a73 100644 (file)
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -1,8 +1,6 @@
-menu "Userspace I/O"
-       depends on !S390
-
-config UIO
+menuconfig UIO
        tristate "Userspace I/O drivers"
+       depends on !S390
        default n
        help
          Enable this to allow the userspace driver core code to be
@@ -13,4 +11,32 @@ config UIO
 
          If you don't know what to do here, say N.
 
-endmenu
+if UIO
+
+config UIO_CIF
+       tristate "generic Hilscher CIF Card driver"
+       depends on UIO && PCI
+       default n
+       help
+         Driver for Hilscher CIF DeviceNet and Profibus cards.  This
+         driver requires a userspace component that handles all of the
+         heavy lifting and can be found at:
+               http://www.osadl.org/projects/downloads/UIO/user/cif-*
+
+         To compile this driver as a module, choose M here: the module
+         will be called uio_cif.
+
+config UIO_SMX
+       tristate "SMX cryptengine UIO interface"
+       depends on UIO
+       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