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 26a0a30..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
@@ -56,7 +56,7 @@ struct brcms_firmware {
 };
 
 struct brcms_info {
-       struct wlc_pub *pub;            /* pointer to public wlc state */
+       struct brcms_pub *pub;          /* pointer to public wlc state */
        void *wlc;              /* pointer to private common os-independent data */
        u32 magic;