diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:41:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:41:16 -0400 |
commit | b4d3de8ca25fcdf697da38d9f9785cb508edea4d (patch) | |
tree | 8d2940fab556b05f4f1c7980c611211ffaa0f025 /drivers/net/wireless/wl12xx/spi.c | |
parent | 3857e3ee2209b7289c434103e366f765ec82a22d (diff) | |
parent | 2fa8b6a0e42570690a48a56cb65778211e3cc9cc (diff) | |
download | linux-b4d3de8ca25fcdf697da38d9f9785cb508edea4d.tar.bz2 |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/spi.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/spi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c index e0b3736d7e19..0f9718677860 100644 --- a/drivers/net/wireless/wl12xx/spi.c +++ b/drivers/net/wireless/wl12xx/spi.c @@ -486,8 +486,6 @@ module_exit(wl1271_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>"); MODULE_AUTHOR("Juuso Oikarinen <juuso.oikarinen@nokia.com>"); -MODULE_FIRMWARE(WL1271_FW_NAME); +MODULE_FIRMWARE(WL127X_FW_NAME); MODULE_FIRMWARE(WL128X_FW_NAME); -MODULE_FIRMWARE(WL127X_AP_FW_NAME); -MODULE_FIRMWARE(WL128X_AP_FW_NAME); MODULE_ALIAS("spi:wl1271"); |