aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 18:30:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 18:30:00 -0700
commitce9e3d9953c8cb67001719b5516da2928e956be4 (patch)
tree77b56ec0815b4381b03418baaf88d092082e2c04 /drivers/net
parent64d9a39ec9ad074384b548c0cead89265c82e166 (diff)
parent74d919465a93b6c2b928b29a8ed3e5e41adbfa93 (diff)
Merge branch 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6
* 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6: [pci_ids] Add Quicknet XJ vendor/device ID's. [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled. [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled. [igafb] Add pci dev table for module auto loading. [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled. [hid-core] TurboX Keyboard needs NOGET quirk. [ixj] Add pci dev table for module auto loading. [initio] Add pci dev table for module auto loading. [fdomain] Add pci dev table for module auto loading. [BusLogic] Add pci dev table for auto module loading. [mv643xx] Add pci device table for auto module loading. [alim7101] Add pci dev table for auto module loading.
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/mv643xx_eth.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 9997081c6da..a4f861bf32d 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1557,6 +1557,12 @@ 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");