Mostly revert "e1000/e1000e: Move PCI-Express device IDs over to e1000e"
commit5b10ca19ea4859d3884d10a3eb8495de92089792
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jan 2008 22:54:54 +0000 (30 09:54 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Jan 2008 22:54:54 +0000 (30 09:54 +1100)
tree3b3ed5d5f28bbecef15266d0e0854e0b9b351a33
parent9e97198dbf318be7958b57900d05b37c7e09ad7c
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>
drivers/net/Kconfig
drivers/net/e1000/e1000_main.c