git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
rt2x00
/
rt2x00firmware.c
diff --git
a/drivers/net/wireless/rt2x00/rt2x00firmware.c
b/drivers/net/wireless/rt2x00/rt2x00firmware.c
index
be0ff78
..
f316aad
100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt2x00firmware.c
+++ b/
drivers/net/wireless/rt2x00/rt2x00firmware.c
@@
-99,7
+99,7
@@
int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev)
{
int retval;
- if (!test_bit(
DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->
flags))
+ if (!test_bit(
REQUIRE_FIRMWARE, &rt2x00dev->cap_
flags))
return 0;
if (!rt2x00dev->fw) {