diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-18 10:55:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-18 10:55:32 -0800 |
| commit | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (patch) | |
| tree | eab385cabe589346bcf19385c997ab8dabaef7bd /drivers/net/wireless/ipw2x00 | |
| parent | ea31ba359c55e0734ff895692185d4c50cf0c537 (diff) | |
| parent | c85e9d7739fc8d879c4293ea020760926d6f87cd (diff) | |
| download | linux-dfef948ed2ba69cf041840b5e860d6b4e16fa0b1.tar.gz linux-dfef948ed2ba69cf041840b5e860d6b4e16fa0b1.tar.bz2 linux-dfef948ed2ba69cf041840b5e860d6b4e16fa0b1.zip | |
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')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 6e2fc0cb6f8a..b7408370cf82 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -8462,6 +8462,12 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv, return 0; } +MODULE_FIRMWARE(IPW2100_FW_NAME("-i")); +#ifdef CONFIG_IPW2100_MONITOR +MODULE_FIRMWARE(IPW2100_FW_NAME("-p")); +#endif +MODULE_FIRMWARE(IPW2100_FW_NAME("")); + static void ipw2100_release_firmware(struct ipw2100_priv *priv, struct ipw2100_fw *fw) { diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 5c6ff58732d5..9b398db2d740 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -80,6 +80,11 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_VERSION(DRV_VERSION); MODULE_AUTHOR(DRV_COPYRIGHT); MODULE_LICENSE("GPL"); +MODULE_FIRMWARE("ipw2200-ibss.fw"); +#ifdef CONFIG_IPW2200_MONITOR +MODULE_FIRMWARE("ipw2200-sniffer.fw"); +#endif +MODULE_FIRMWARE("ipw2200-bss.fw"); static int cmdlog = 0; static int debug = 0; |