From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 4 Nov 2013 19:45:14 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=01925efdf7e03b4b803b5c9f985163d687f7f017;p=linux-beck.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/drv.c
---

01925efdf7e03b4b803b5c9f985163d687f7f017
diff --cc drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index c768ec2d473d,c3462b75bd08..905704e335d7
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@@ -476,11 -464,9 +476,9 @@@ static struct sdio_driver brcmf_sdmmc_d
  
  static int brcmf_sdio_pd_probe(struct platform_device *pdev)
  {
- 	int ret;
- 
  	brcmf_dbg(SDIO, "Enter\n");
  
 -	brcmfmac_sdio_pdata = pdev->dev.platform_data;
 +	brcmfmac_sdio_pdata = dev_get_platdata(&pdev->dev);
  
  	if (brcmfmac_sdio_pdata->power_on)
  		brcmfmac_sdio_pdata->power_on();
diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
index ddf15e1cffa2,26108a1a29fa..941c0c88f982
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@@ -258,10 -268,12 +268,12 @@@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_c
  #endif /* CONFIG_IWLDVM */
  
  #if IS_ENABLED(CONFIG_IWLMVM)
 -/* 7000 Series */
 +/* 7260 Series */
  	{IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
+ 	{IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
+ 	{IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
@@@ -308,9 -349,7 +349,10 @@@
  	{IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
  	{IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
  	{IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
+ 	{IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},
 +
 +/* 7265 Series */
 +	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},
  #endif /* CONFIG_IWLMVM */
  
  	{0}