From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 15 Jul 2011 14:05:24 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.1-rc1~316^2~124^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95a943c162d74b20d869917bdf5df11293c35b63;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	net/bluetooth/l2cap_core.c
---

95a943c162d74b20d869917bdf5df11293c35b63
diff --cc drivers/net/wireless/b43/main.c
index e9a01e3,8bcda50..092dd93
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -4104,9 -4243,15 +4243,15 @@@ static int b43_phy_versioning(struct b4
  			unsupported = 1;
  		break;
  #endif
+ #ifdef CONFIG_B43_PHY_LCN
+ 	case B43_PHYTYPE_LCN:
+ 		if (phy_rev > 1)
+ 			unsupported = 1;
+ 		break;
+ #endif
  	default:
  		unsupported = 1;
 -	};
 +	}
  	if (unsupported) {
  		b43err(dev->wl, "FOUND UNSUPPORTED PHY "
  		       "(Analog %u, Type %u, Revision %u)\n",