linux-next: manual merge of the wireless-next tree with the pcitree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/pci.c between commit 08bd108096b6 ("ath9k:
Use PCI Express Capability accessors") from the pci tree and commit
046b6802c8d3 ("ath9k: Disable ASPM only for AR9285") from the
wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/wireless/ath/ath9k/pci.c
index c4f6980,c0c5996..0000000
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@@ -123,10 -128,12 +123,11 @@@ static void ath_pci_aspm_init(struct at
  	if (!parent)
  		return;
  
- 	if (ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) {
- 		/* Bluetooth coexistance requires disabling ASPM. */
+ 	if ((ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) &&
+ 	    (AR_SREV_9285(ah))) {
+ 		/* Bluetooth coexistance requires disabling ASPM for AR9285. */
 -		pci_read_config_byte(pdev, pos + PCI_EXP_LNKCTL, &aspm);
 -		aspm &= ~(PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
 -		pci_write_config_byte(pdev, pos + PCI_EXP_LNKCTL, aspm);
 +		pcie_capability_clear_word(pdev, PCI_EXP_LNKCTL,
 +			PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1);
  
  		/*
  		 * Both upstream and downstream PCIe components should

Attachment: pgp00000.pgp
Description: PGP signature