From 7b25f2aaaf1c3085ad5840751c40a2e92284be15 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 20 Oct 2006 10:40:48 -0700
Subject: [PATCH] --- yaml --- r: 40077 b: refs/heads/master c:
 b2ef7858db6394b758818358a43c7dd5f232bbcc h: refs/heads/master i:   40075:
 d493b9715eb5d943ea35dc9a9c3320c3c42a41ca v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 336a72f5a899..e1520732146b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c2aed4b5632fb536721b8494d1a4a65852ffb49
+refs/heads/master: b2ef7858db6394b758818358a43c7dd5f232bbcc
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index a4f861bf32d6..9997081c6dae 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/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");