diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/dl2k.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/dl2k.h')
| -rw-r--r-- | drivers/net/dl2k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h index 266ec8777ca8..7caab3d26a9e 100644 --- a/drivers/net/dl2k.h +++ b/drivers/net/dl2k.h | |||
| @@ -537,7 +537,7 @@ struct netdev_private { | |||
| 537 | driver_data Data private to the driver. | 537 | driver_data Data private to the driver. |
| 538 | */ | 538 | */ |
| 539 | 539 | ||
| 540 | static const struct pci_device_id rio_pci_tbl[] = { | 540 | static DEFINE_PCI_DEVICE_TABLE(rio_pci_tbl) = { |
| 541 | {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, }, | 541 | {0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, }, |
| 542 | {0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, }, | 542 | {0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, }, |
| 543 | { } | 543 | { } |