diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:40:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:40:48 -0400 |
commit | b2ef7858db6394b758818358a43c7dd5f232bbcc (patch) | |
tree | 21e518e654bc08430ddad8e9c63e19e472d33f18 | |
parent | 7c2aed4b5632fb536721b8494d1a4a65852ffb49 (diff) |
Revert "[mv643xx] Add pci device table for auto module loading."
This reverts commit 4596c75c23dde2623cbeec69357d5eb13d28387e as
requested by Olaf Hering. It causes compile errors, and says Olaf:
"This change is also wrong, the autoloading works perfect with 2.6.18,
no need to add random PCI ids.
See commit a0245f7ad5214cb00131d7cd176446e067c913dc, platform devices
have now a modalias entry in sysfs. The network card is not a PCI
device."
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/net/mv643xx_eth.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index a4f861bf32d6..9997081c6dae 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -1557,12 +1557,6 @@ static void __exit mv643xx_cleanup_module(void) | |||
1557 | module_init(mv643xx_init_module); | 1557 | module_init(mv643xx_init_module); |
1558 | module_exit(mv643xx_cleanup_module); | 1558 | module_exit(mv643xx_cleanup_module); |
1559 | 1559 | ||
1560 | static struct pci_device_id pci_marvell_mv64360[] = { | ||
1561 | { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) }, | ||
1562 | {} | ||
1563 | }; | ||
1564 | MODULE_DEVICE_TABLE(pci, pci_marvell_mv64360); | ||
1565 | |||
1566 | MODULE_LICENSE("GPL"); | 1560 | MODULE_LICENSE("GPL"); |
1567 | MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani" | 1561 | MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani" |
1568 | " and Dale Farnsworth"); | 1562 | " and Dale Farnsworth"); |