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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
drivers
/
staging
/
brcm80211
/
brcmsmac
/
mac80211_if.h
diff --git
a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
index
42fc04c
..
40e3d37
100644
(file)
--- a/
drivers/staging/brcm80211/brcmsmac/mac80211_if.h
+++ b/
drivers/staging/brcm80211/brcmsmac/mac80211_if.h
@@
-21,7
+21,7
@@
#include <linux/interrupt.h>
/* softmac ioctl definitions */
-#define
WLC_SET_SHORTSLOT_OVERRIDE
146
+#define
BRCMS_SET_SHORTSLOT_OVERRIDE
146
/* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and