diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 22:54:54 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 22:54:54 (GMT) |
| commit | 5b10ca19ea4859d3884d10a3eb8495de92089792 (patch) | |
| tree | 3b3ed5d5f28bbecef15266d0e0854e0b9b351a33 /drivers/net/Kconfig | |
| parent | 9e97198dbf318be7958b57900d05b37c7e09ad7c (diff) | |
| download | linux-5b10ca19ea4859d3884d10a3eb8495de92089792.tar.xz | |
Mostly revert "e1000/e1000e: Move PCI-Express device IDs over to e1000e"
The new e1000e driver is apparently not yet suitable for general use, so
mark it experimental, and re-instate all the PCI-Express device IDs in
the old and stable e1000 driver so that people (namely me) can continue
to use a driver that actually works.
Auke & co have been appraised of the situation.
Cc: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index af40ff4..5a2d1dd 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1992,7 +1992,7 @@ config E1000_DISABLE_PACKET_SPLIT config E1000E tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" - depends on PCI + depends on PCI && EXPERIMENTAL ---help--- This driver supports the PCI-Express Intel(R) PRO/1000 gigabit ethernet family of adapters. For PCI or PCI-X e1000 adapters, |