diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:24 -0400 |
| commit | 5c4d5e816c2cc86e17d09677b649be47fbc30e51 (patch) | |
| tree | b13327e59b6ea29095b9b33b4cdd5dffab9a66d3 /drivers/net/wireless/b43/main.c | |
| parent | f473832fece16611520bf54ad52b16c3f6db0a94 (diff) | |
| parent | 2c4db12ec469b9fcdad9f6bfd6fa20e65a563ac5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index b2bc593a6513..15aaeb132a32 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -5250,6 +5250,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) /* We don't support 5 GHz on some PHYs yet */ switch (dev->phy.type) { case B43_PHYTYPE_A: + case B43_PHYTYPE_G: case B43_PHYTYPE_N: case B43_PHYTYPE_LP: case B43_PHYTYPE_HT: |