diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-10-03 14:24:46 -0400 |
| commit | 447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch) | |
| tree | 676e741f2552c9cb301e1e49c557b92bf8940f55 /drivers/net/wireless/iwlegacy/3945.c | |
| parent | 3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff) | |
| parent | 042e1c79166b9250edd8262bea84e1703f27ad2e (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/3945.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c index b598e2803500..93bdf684babe 100644 --- a/drivers/net/wireless/iwlegacy/3945.c +++ b/drivers/net/wireless/iwlegacy/3945.c | |||
| @@ -2728,7 +2728,7 @@ static struct il_cfg il3945_abg_cfg = { | |||
| 2728 | }, | 2728 | }, |
| 2729 | }; | 2729 | }; |
| 2730 | 2730 | ||
| 2731 | DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = { | 2731 | const struct pci_device_id il3945_hw_card_ids[] = { |
| 2732 | {IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)}, | 2732 | {IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)}, |
| 2733 | {IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)}, | 2733 | {IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)}, |
| 2734 | {IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)}, | 2734 | {IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)}, |