diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
| commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
| tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /drivers/net/wireless/airo.c | |
| parent | 2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff) | |
| parent | b78612b796b0d6cdfba553d456eff008278830e3 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 849ac88bcccc..6afc6e5dee9b 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -47,6 +47,8 @@ | |||
| 47 | #include <linux/pci.h> | 47 | #include <linux/pci.h> |
| 48 | #include <asm/uaccess.h> | 48 | #include <asm/uaccess.h> |
| 49 | 49 | ||
| 50 | #include "airo.h" | ||
| 51 | |||
| 50 | #ifdef CONFIG_PCI | 52 | #ifdef CONFIG_PCI |
| 51 | static struct pci_device_id card_ids[] = { | 53 | static struct pci_device_id card_ids[] = { |
| 52 | { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, | 54 | { 0x14b9, 1, PCI_ANY_ID, PCI_ANY_ID, }, |