From d0810c177995c388fd054400e97d4bba6d9542ac Mon Sep 17 00:00:00 2001 From: Franky Lin Date: Tue, 23 Aug 2011 14:13:56 +0200 Subject: [PATCH] --- yaml --- r: 267502 b: refs/heads/master c: 60be7ec5099cee40f40b0fbb75ea4396016a5231 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index caed21d29b94..99de341c142a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85fd3ec4b1048d84f1c36438c7a91827a49c97c7 +refs/heads/master: 60be7ec5099cee40f40b0fbb75ea4396016a5231 diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h index 049138b9e5de..0542bac2d79e 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h @@ -317,7 +317,7 @@ struct brcmf_cfg80211_priv { u8 *ioctl_buf; /* ioctl buffer */ u8 *extra_buf; /* maily to grab assoc information */ struct dentry *debugfsdir; - u8 ci[0] __attribute__ ((__aligned__(NETDEV_ALIGN))); + u8 ci[0] __aligned(NETDEV_ALIGN); }; #define cfg_to_wiphy(w) (w->wdev->wiphy)