From edb34a4dbdfec6fd83fe907dbf4498eedc77e17e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 26 Oct 2011 17:21:19 +0200 Subject: [PATCH] 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 Signed-off-by: Linus Torvalds --- drivers/staging/et131x/Kconfig | 2 +- drivers/staging/slicoss/Kconfig | 2 +- 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. -- 2.11.4.GIT