From 94d1a0eeec849ab50fd5481aa81866369f0eb135 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 26 Oct 2011 17:21:19 +0200 Subject: [PATCH] --- yaml --- r: 269205 b: refs/heads/master c: edb34a4dbdfec6fd83fe907dbf4498eedc77e17e h: refs/heads/master i: 269203: 412df5484a63779ddbaa95dda08aa4d4700483ea v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/Kconfig | 2 +- trunk/drivers/staging/slicoss/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c879649066cd..64fee6285b9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39adff5f69d6849ca22353a88058c9f8630528c0 +refs/heads/master: edb34a4dbdfec6fd83fe907dbf4498eedc77e17e diff --git a/trunk/drivers/staging/et131x/Kconfig b/trunk/drivers/staging/et131x/Kconfig index f0ed08d6a977..9e1864c6dfd0 100644 --- a/trunk/drivers/staging/et131x/Kconfig +++ b/trunk/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/trunk/drivers/staging/slicoss/Kconfig b/trunk/drivers/staging/slicoss/Kconfig index d2993d339bc6..5cde96b2e6e1 100644 --- a/trunk/drivers/staging/slicoss/Kconfig +++ b/trunk/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.