iwlwifi: move ucode_type from iwl_priv to iwl_shared

Move the ucode_type variable from the iwl_priv to the iwl_shared
structure with associated code changes.

Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

diff --cc drivers/net/wireless/iwlwifi/iwl-debugfs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-shared.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-trans.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-ucode.c
Simple merge