diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-18 13:55:32 -0500 |
| commit | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch) | |
| tree | eab385cabe589346bcf19385c997ab8dabaef7bd /drivers/net/wireless/ipw2x00/ipw2200.c | |
| parent | ea31ba359c55e0734ff895692185d4c50cf0c537 (diff) | |
| parent | c85e9d7739fc8d879c4293ea020760926d6f87cd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 5c6ff58732d..9b398db2d74 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
| @@ -80,6 +80,11 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); | |||
| 80 | MODULE_VERSION(DRV_VERSION); | 80 | MODULE_VERSION(DRV_VERSION); |
| 81 | MODULE_AUTHOR(DRV_COPYRIGHT); | 81 | MODULE_AUTHOR(DRV_COPYRIGHT); |
| 82 | MODULE_LICENSE("GPL"); | 82 | MODULE_LICENSE("GPL"); |
| 83 | MODULE_FIRMWARE("ipw2200-ibss.fw"); | ||
| 84 | #ifdef CONFIG_IPW2200_MONITOR | ||
| 85 | MODULE_FIRMWARE("ipw2200-sniffer.fw"); | ||
| 86 | #endif | ||
| 87 | MODULE_FIRMWARE("ipw2200-bss.fw"); | ||
| 83 | 88 | ||
| 84 | static int cmdlog = 0; | 89 | static int cmdlog = 0; |
| 85 | static int debug = 0; | 90 | static int debug = 0; |