iwlwifi: fix-up some merge damage from commit 0d6c4a2
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 May 2012 02:18:09 +0000 (22:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 May 2012 02:18:09 +0000 (22:18 -0400)
commit341352d13dae752610342923c53ebe461624ee2c
tree05797e3686984b0e1b963882e886e95817c1d4dc
parent70c33eaae79e53f9e48324736c0cb85534d3f093
iwlwifi: fix-up some merge damage from commit 0d6c4a2

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn-rx.c