diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-08-26 09:19:29 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-26 13:53:10 -0400 |
commit | 0a980d455baef8194105702c85834a0368172fe0 (patch) | |
tree | 4781b62953ede2a9c24041aeec0b3d11a37b997c /drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | |
parent | 04831578b801f56ef664f1593dc0f4197eb696a2 (diff) |
staging: brcm80211: remove macro definitions from brcmsmac Makefile
The Makefile for the brcmsmac driver contains macro definitions that
are always set and even some are not used in the source code anymore.
This patch removes those definitions from the Makefile and source code.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c')
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index 5307bd8c258..cbb0bde439e 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | |||
@@ -1666,13 +1666,10 @@ void wlc_phy_txpower_recalc_target(struct brcms_phy *pi) | |||
1666 | } | 1666 | } |
1667 | } | 1667 | } |
1668 | } | 1668 | } |
1669 | #if WL11N | 1669 | |
1670 | max_num_rate = ((ISNPHY(pi)) ? (TXP_NUM_RATES) : | 1670 | max_num_rate = ((ISNPHY(pi)) ? (TXP_NUM_RATES) : |
1671 | ((ISLCNPHY(pi)) ? | 1671 | ((ISLCNPHY(pi)) ? |
1672 | (TXP_LAST_SISO_MCS_20 + 1) : (TXP_LAST_OFDM + 1))); | 1672 | (TXP_LAST_SISO_MCS_20 + 1) : (TXP_LAST_OFDM + 1))); |
1673 | #else | ||
1674 | max_num_rate = ((ISNPHY(pi)) ? (TXP_NUM_RATES) : (TXP_LAST_OFDM + 1)); | ||
1675 | #endif | ||
1676 | 1673 | ||
1677 | wlc_phy_upd_env_txpwr_rate_limits(pi, band); | 1674 | wlc_phy_upd_env_txpwr_rate_limits(pi, band); |
1678 | 1675 | ||