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/wireless/atmel_pci.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/atmel_pci.c')
| -rw-r--r-- | drivers/net/wireless/atmel_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c index 92f87fbe750f..9ab1192004c0 100644 --- a/drivers/net/wireless/atmel_pci.c +++ b/drivers/net/wireless/atmel_pci.c | |||
| @@ -31,7 +31,7 @@ MODULE_DESCRIPTION("Support for Atmel at76c50x 802.11 wireless ethernet cards.") | |||
| 31 | MODULE_LICENSE("GPL"); | 31 | MODULE_LICENSE("GPL"); |
| 32 | MODULE_SUPPORTED_DEVICE("Atmel at76c506 PCI wireless cards"); | 32 | MODULE_SUPPORTED_DEVICE("Atmel at76c506 PCI wireless cards"); |
| 33 | 33 | ||
| 34 | static struct pci_device_id card_ids[] = { | 34 | static DEFINE_PCI_DEVICE_TABLE(card_ids) = { |
| 35 | { 0x1114, 0x0506, PCI_ANY_ID, PCI_ANY_ID }, | 35 | { 0x1114, 0x0506, PCI_ANY_ID, PCI_ANY_ID }, |
| 36 | { 0, } | 36 | { 0, } |
| 37 | }; | 37 | }; |