iwlwifi: fix cmd_queue number merge
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 9 Mar 2012 18:12:42 +0000 (10:12 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 9 Mar 2012 18:20:50 +0000 (13:20 -0500)
commit9ba1947a89938ee83e7c16709ee4095ae3e36c44
tree5ed60bd99f5245db8a51cfc5389938c272601c5f
parent3dc420be8ce72688bd333afdab6d911e3ceb94e7
iwlwifi: fix cmd_queue number merge

iwlwifi: move command queue number out of the iwl_shared struct
move the cmd_queue out of iwl_shared struct, but for some reason the
patch is half done and fail compile

Here is the fix

John, could you apply this patch to wireless-next to address the issue
Thanks

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-prph.h
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c