diff --git a/[refs] b/[refs]
index a3a831fcc182..9abc18bd0679 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 280bdcad857b781d701153054f524a1b3a1a2a50
+refs/heads/master: 04831578b801f56ef664f1593dc0f4197eb696a2
diff --git a/trunk/drivers/staging/brcm80211/Makefile b/trunk/drivers/staging/brcm80211/Makefile
index 8b01f5e7ba25..f41c047eca82 100644
--- a/trunk/drivers/staging/brcm80211/Makefile
+++ b/trunk/drivers/staging/brcm80211/Makefile
@@ -16,7 +16,6 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 # common flags
-subdir-ccflags-y					:= -DBCMDMA32
 subdir-ccflags-$(CONFIG_BRCMDBG)	+= -DBCMDBG
 
 obj-$(CONFIG_BRCMUTIL)	+= brcmutil/