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>

diff --git a/drivers/staging/et131x/Kconfig b/drivers/staging/et131x/Kconfig
index f0ed08d..9e1864c 100644 (file)
--- a/drivers/staging/et131x/Kconfig
+++ b/drivers/staging/et131x/Kconfig
@@ -1,6 +1,6 @@
 config ET131X
        tristate "Agere ET-1310 Gigabit Ethernet support"
 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.
        default n
        ---help---
          This driver supports Agere ET-1310 ethernet adapters.

diff --git a/drivers/staging/slicoss/Kconfig b/drivers/staging/slicoss/Kconfig
index d2993d3..5cde96b 100644 (file)
--- a/drivers/staging/slicoss/Kconfig
+++ b/drivers/staging/slicoss/Kconfig
@@ -1,6 +1,6 @@
 config SLICOSS
        tristate "Alacritech Gigabit IS-NIC support"
 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.
        default n
        help
          This driver supports Alacritech's IS-NIC gigabit ethernet cards.