From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 20 Oct 2006 17:40:48 +0000 (-0700)
Subject: Revert "[mv643xx] Add pci device table for auto module loading."
X-Git-Tag: v2.6.19-rc3~41
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2ef7858db6394b758818358a43c7dd5f232bbcc;p=linux-2.6

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>
---

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a4f861bf32..9997081c6d 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1557,12 +1557,6 @@ static void __exit mv643xx_cleanup_module(void)
 module_init(mv643xx_init_module);
 module_exit(mv643xx_cleanup_module);
 
-static struct pci_device_id pci_marvell_mv64360[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },
-	{}
-};
-MODULE_DEVICE_TABLE(pci, pci_marvell_mv64360);
-
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR(	"Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
 		" and Dale Farnsworth");