From 8c0ff07b6d6b11fb4dd3e8df5f12c6c7336b1f94 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Mon, 15 Aug 2011 15:34:25 +0200 Subject: [PATCH] --- yaml --- r: 267496 b: refs/heads/master c: 3bd8ef6799524fd48044a83aab38da57d9a98dbc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/types.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a5b6788480e5..0683f22570b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a87602e075126c9a7acad7ba999a40837f966e54 +refs/heads/master: 3bd8ef6799524fd48044a83aab38da57d9a98dbc diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index c00178d18b5a..448afae0d69e 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -380,7 +380,7 @@ void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val) regs = pi->regs; -#ifdef __mips__ +#ifdef CONFIG_BCM47XX W_REG_FLUSH(®s->phyregaddr, addr); W_REG(®s->phyregdata, val); if (addr == 0x72) diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/types.h b/trunk/drivers/staging/brcm80211/brcmsmac/types.h index ad874a79cb4c..d44db5674b31 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/types.h +++ b/trunk/drivers/staging/brcm80211/brcmsmac/types.h @@ -362,7 +362,7 @@ do { \ } \ } while (0) -#ifdef __mips__ +#ifdef CONFIG_BCM47XX /* * bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder * transactions. As a fix, a read after write is performed on certain places @@ -371,7 +371,7 @@ do { \ #define W_REG_FLUSH(r, v) ({ W_REG((r), (v)); (void)R_REG(r); }) #else #define W_REG_FLUSH(r, v) W_REG((r), (v)) -#endif /* __mips__ */ +#endif /* CONFIG_BCM47XX */ #define AND_REG(r, v) W_REG((r), R_REG(r) & (v)) #define OR_REG(r, v) W_REG((r), R_REG(r) | (v))