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.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.c')
-rw-r--r-- | drivers/net/wireless/atmel.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index cce188837d10..3edbbcf0f548 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -99,6 +99,22 @@ static struct { | |||
99 | { ATMEL_FW_TYPE_506, "atmel_at76c506", "bin" }, | 99 | { ATMEL_FW_TYPE_506, "atmel_at76c506", "bin" }, |
100 | { ATMEL_FW_TYPE_NONE, NULL, NULL } | 100 | { ATMEL_FW_TYPE_NONE, NULL, NULL } |
101 | }; | 101 | }; |
102 | MODULE_FIRMWARE("atmel_at76c502-wpa.bin"); | ||
103 | MODULE_FIRMWARE("atmel_at76c502.bin"); | ||
104 | MODULE_FIRMWARE("atmel_at76c502d-wpa.bin"); | ||
105 | MODULE_FIRMWARE("atmel_at76c502d.bin"); | ||
106 | MODULE_FIRMWARE("atmel_at76c502e-wpa.bin"); | ||
107 | MODULE_FIRMWARE("atmel_at76c502e.bin"); | ||
108 | MODULE_FIRMWARE("atmel_at76c502_3com-wpa.bin"); | ||
109 | MODULE_FIRMWARE("atmel_at76c502_3com.bin"); | ||
110 | MODULE_FIRMWARE("atmel_at76c504-wpa.bin"); | ||
111 | MODULE_FIRMWARE("atmel_at76c504.bin"); | ||
112 | MODULE_FIRMWARE("atmel_at76c504_2958-wpa.bin"); | ||
113 | MODULE_FIRMWARE("atmel_at76c504_2958.bin"); | ||
114 | MODULE_FIRMWARE("atmel_at76c504a_2958-wpa.bin"); | ||
115 | MODULE_FIRMWARE("atmel_at76c504a_2958.bin"); | ||
116 | MODULE_FIRMWARE("atmel_at76c506-wpa.bin"); | ||
117 | MODULE_FIRMWARE("atmel_at76c506.bin"); | ||
102 | 118 | ||
103 | #define MAX_SSID_LENGTH 32 | 119 | #define MAX_SSID_LENGTH 32 |
104 | #define MGMT_JIFFIES (256 * HZ / 100) | 120 | #define MGMT_JIFFIES (256 * HZ / 100) |