Merge branch 'master' into for-linus

[mv-sheeva.git] / drivers / uio / Kconfig

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 7f86534de26970ef785b2b02066ff7e1c2bba19f..8aa1955f35ed5f0099609565c0cdc89022f13396 100644 (file)
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -1,7 +1,6 @@
 menuconfig UIO
        tristate "Userspace I/O drivers"
        depends on !S390
 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
        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
 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
        help
          Driver for Hilscher CIF DeviceNet and Profibus cards.  This
          driver requires a userspace component that handles all of the


@@ -48,7 +46,6 @@ config UIO_PDRV_GENIRQ
 
 config UIO_SMX
        tristate "SMX cryptengine UIO interface"
 
 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
        help
          Userspace IO interface to the Cryptography engine found on the
          Nias Digital SMX boards.  These will be available from Q4 2008


@@ -61,7 +58,6 @@ config UIO_SMX
 config UIO_AEC
        tristate "AEC video timestamp device"
        depends on PCI
 config UIO_AEC
        tristate "AEC video timestamp device"
        depends on PCI

-       default n

        help
 
          UIO driver for the Adrienne Electronics Corporation PCI time
        help
 
          UIO driver for the Adrienne Electronics Corporation PCI time


@@ -78,7 +74,6 @@ config UIO_AEC
 
 config UIO_SERCOS3
        tristate "Automata Sercos III PCI card driver"
 
 config UIO_SERCOS3
        tristate "Automata Sercos III PCI card driver"

-       default n

        help
          Userspace I/O interface for the Sercos III PCI card from
          Automata GmbH. The userspace part of this driver will be
        help
          Userspace I/O interface for the Sercos III PCI card from
          Automata GmbH. The userspace part of this driver will be


@@ -89,4 +84,14 @@ config UIO_SERCOS3
 
          If you compile this as a module, it will be called uio_sercos3.
 
 
          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
+       default n
+       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.
+

 endif
 endif