diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
| commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
| tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /drivers/atm/zatm.c | |
| parent | 57682827b9a5edb52e33af0be9082b51bffcd5c7 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/atm/zatm.c')
| -rw-r--r-- | drivers/atm/zatm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index 702accec89e..4e885d2da49 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c @@ -1637,10 +1637,8 @@ out_free: MODULE_LICENSE("GPL"); static struct pci_device_id zatm_pci_tbl[] __devinitdata = { - { PCI_VENDOR_ID_ZEITNET, PCI_DEVICE_ID_ZEITNET_1221, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, ZATM_COPPER }, - { PCI_VENDOR_ID_ZEITNET, PCI_DEVICE_ID_ZEITNET_1225, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, + { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1221), ZATM_COPPER }, + { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1225), 0 }, { 0, } }; MODULE_DEVICE_TABLE(pci, zatm_pci_tbl); |