summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43/main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-30 08:51:00 +0400
committerDavid S. Miller <davem@davemloft.net>2008-07-30 08:51:00 +0400
commite93dc4891df93d7efa59d861fdcbb529a1819343 (patch)
tree545d95bc78c76d44b22bf2590c033311f44c0616 /drivers/net/wireless/b43/main.c
parent6e86841d05f371b5b9b86ce76c02aaee83352298 (diff)
parent56a6d13dfd49d90d72a1a962246206719dd9d143 (diff)
downloadlinux-e93dc4891df93d7efa59d861fdcbb529a1819343.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r--drivers/net/wireless/b43/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index e78319aa47c1..3bf3a869361f 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4645,8 +4645,7 @@ static int b43_wireless_init(struct ssb_device *dev)
}
/* fill hw info */
- hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
- IEEE80211_HW_RX_INCLUDES_FCS |
+ hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
IEEE80211_HW_SIGNAL_DBM |
IEEE80211_HW_NOISE_DBM;