]> git.openfabrics.org - ~emulex/infiniband.git/commit
ath5k: fixup some merge damage for AR5211 IQ calibration
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 8 Apr 2010 20:34:49 +0000 (16:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 8 Apr 2010 20:40:04 +0000 (16:40 -0400)
commitace5d5de6bbaff00d3b5dd7ea8f160b570fdb726
treead3f1d425e4feb66e00702c1c8f512548fff7803
parentf74cb0f7b1d8d6e4c11c6679a7d012be641225e3
ath5k: fixup some merge damage for AR5211 IQ calibration

Resolution of a merge conflict upstream accidentally removed a hunk of
"ath5k: IQ calibration for AR5211 is slightly different", so restore it.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath5k/phy.c