diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-04 17:28:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-04 17:28:58 -0500 |
| commit | bd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch) | |
| tree | e96ef46426d293b730a305b5185ba5412c9172d4 /drivers/net/atl1c | |
| parent | 2b7bcebf958c74124220ee8103024def8597b36c (diff) | |
| parent | 1e6d93e45b231b3ae87c01902ede2315aacfe976 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/atl1c')
| -rw-r--r-- | drivers/net/atl1c/atl1c_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c index a699bbf20eb5..3824382faecc 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c | |||
| @@ -48,6 +48,7 @@ static DEFINE_PCI_DEVICE_TABLE(atl1c_pci_tbl) = { | |||
| 48 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)}, | 48 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B)}, |
| 49 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)}, | 49 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L2C_B2)}, |
| 50 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)}, | 50 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D)}, |
| 51 | {PCI_DEVICE(PCI_VENDOR_ID_ATTANSIC, PCI_DEVICE_ID_ATHEROS_L1D_2_0)}, | ||
| 51 | /* required last entry */ | 52 | /* required last entry */ |
| 52 | { 0 } | 53 | { 0 } |
| 53 | }; | 54 | }; |