summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 17:21:19 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 17:21:19 +0200
commitedb34a4dbdfec6fd83fe907dbf4498eedc77e17e (patch)
treece688c28c6733019675e2855efa1036f8c79d655
parent39adff5f69d6849ca22353a88058c9f8630528c0 (diff)
downloadlinux-3.10-edb34a4dbdfec6fd83fe907dbf4498eedc77e17e.tar.gz
linux-3.10-edb34a4dbdfec6fd83fe907dbf4498eedc77e17e.tar.bz2
linux-3.10-edb34a4dbdfec6fd83fe907dbf4498eedc77e17e.zip
Remove stale "depends on NETDEV_1000"in staging drivers
Mark Einon points out that the Kconfig option for NETDEV_1000 no longer exists, and the merge of the staging drivers should have removed that for the et131x driver. And while checking for it, I noticed that slicoss had the same stale dependency. Remove that one too. Reported-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/staging/et131x/Kconfig2
-rw-r--r--drivers/staging/slicoss/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/et131x/Kconfig b/drivers/staging/et131x/Kconfig
index f0ed08d6a97..9e1864c6dfd 100644
--- a/drivers/staging/et131x/Kconfig
+++ b/drivers/staging/et131x/Kconfig
@@ -1,6 +1,6 @@
config ET131X
tristate "Agere ET-1310 Gigabit Ethernet support"
- depends on NETDEV_1000 && PCI
+ depends on PCI
default n
---help---
This driver supports Agere ET-1310 ethernet adapters.
diff --git a/drivers/staging/slicoss/Kconfig b/drivers/staging/slicoss/Kconfig
index d2993d339bc..5cde96b2e6e 100644
--- a/drivers/staging/slicoss/Kconfig
+++ b/drivers/staging/slicoss/Kconfig
@@ -1,6 +1,6 @@
config SLICOSS
tristate "Alacritech Gigabit IS-NIC support"
- depends on PCI && X86 && NETDEV_1000
+ depends on PCI && X86
default n
help
This driver supports Alacritech's IS-NIC gigabit ethernet cards.