diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
| commit | 95a943c162d74b20d869917bdf5df11293c35b63 (patch) | |
| tree | c69d5cb97a4d97b6062a276ecdfa8582535193af /drivers/net/wireless/b43/phy_common.c | |
| parent | ecae42d37045ec71831d0e0e493e00b0e0732edd (diff) | |
| parent | 95acac61ba66c4abd40e038dae8c1ed2e176c7b1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/net/wireless/b43/phy_common.c')
| -rw-r--r-- | drivers/net/wireless/b43/phy_common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c index 9705950f059..101957512bc 100644 --- a/drivers/net/wireless/b43/phy_common.c +++ b/drivers/net/wireless/b43/phy_common.c @@ -32,6 +32,7 @@ #include "phy_n.h" #include "phy_lp.h" #include "phy_ht.h" +#include "phy_lcn.h" #include "b43.h" #include "main.h" @@ -65,6 +66,11 @@ int b43_phy_allocate(struct b43_wldev *dev) phy->ops = &b43_phyops_ht; #endif break; + case B43_PHYTYPE_LCN: +#ifdef CONFIG_B43_PHY_LCN + phy->ops = &b43_phyops_lcn; +#endif + break; } if (B43_WARN_ON(!phy->ops)) return -ENODEV; |