summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ogness <john.ogness@linutronix.de>2010-02-11 15:38:53 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-07 17:04:51 -0800
commit0a965eb9f69caf0fb331d45556da8bab1c8dcb11 (patch)
tree6d24a1606b9b0a96c94828140d65a7a871e63e05
parent8f314cfc1259d3f5039b142ce6fdc90367c22d82 (diff)
downloadlinux-3.10-0a965eb9f69caf0fb331d45556da8bab1c8dcb11.tar.gz
linux-3.10-0a965eb9f69caf0fb331d45556da8bab1c8dcb11.tar.bz2
linux-3.10-0a965eb9f69caf0fb331d45556da8bab1c8dcb11.zip
UIO: minor Kconfig fixes
Two trivial fixes for the Userspace IO Kconfig file: 1) uio_sercos3 is a PCI driver, so let it depend on PCI. 2) "default n" under UIO_PCI_GENERIC is luxury since it is already the default. Acked-by: John Ogness <john.ogness@linutronix.de> Signed-off-by: Hans J. Koch <hjk@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/uio/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 069b1443be6..6dd2a290f32 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -74,6 +74,7 @@ config UIO_AEC
config UIO_SERCOS3
tristate "Automata Sercos III PCI card driver"
+ depends on PCI
help
Userspace I/O interface for the Sercos III PCI card from
Automata GmbH. The userspace part of this driver will be
@@ -87,7 +88,6 @@ config 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,