diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/uio/Kconfig | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/uio/Kconfig')
| -rw-r--r-- | drivers/uio/Kconfig | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig index 7f86534..8aa1955 100644 --- 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 @@ -48,7 +46,6 @@ config UIO_PDRV_GENIRQ 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 @@ -61,7 +58,6 @@ config UIO_SMX config UIO_AEC tristate "AEC video timestamp device" depends on PCI - default n 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" - default n 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. +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 |