diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-02-10 14:17:10 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-02-10 14:17:10 +0100 |
| commit | 9ab99d5a43e9f283738fd9fd365539306d13eaac (patch) | |
| tree | 0214a63e3f4f7f4f187f0139e4a5d8abe453902b /drivers/net/sundance.c | |
| parent | 76780373190d7e8ddfb6fed06aef068e2445c743 (diff) | |
| parent | b1109bf085c8dd69537b7876ea83f914dd1fe46a (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/sundance.c')
| -rw-r--r-- | drivers/net/sundance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index d58e1891ca6..0c972e560cf 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c @@ -206,7 +206,7 @@ IVc. Errata #define USE_IO_OPS 1 #endif -static const struct pci_device_id sundance_pci_tbl[] = { +static DEFINE_PCI_DEVICE_TABLE(sundance_pci_tbl) = { { 0x1186, 0x1002, 0x1186, 0x1002, 0, 0, 0 }, { 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 }, { 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 }, |