From fd8e9f4401c43bf19c7917146053c70e0efaf56d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 5 Feb 2014 20:02:48 +0000 Subject: acx-mac80211: fix build after recent mac80211 update and refresh patches This was only build tested. Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39482 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/001-pci-mem-Fix-3.8-build.patch | 25 ++++++++-------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch') diff --git a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch b/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch index 2ee8c2ab50..fa4a6be6ab 100644 --- a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch +++ b/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch @@ -12,11 +12,9 @@ Signed-off-by: Oliver Winker pci.c | 26 +++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) -diff --git a/mem.c b/mem.c -index 87e01f1..f1ff7e2 100644 --- a/mem.c +++ b/mem.c -@@ -2216,7 +2216,11 @@ int acx100mem_ioctl_set_phy_amp_bias(struct ieee80211_hw *hw, +@@ -2216,7 +2216,11 @@ int acx100mem_ioctl_set_phy_amp_bias(str * ================================================== */ @@ -28,7 +26,7 @@ index 87e01f1..f1ff7e2 100644 { acx_device_t *adev = NULL; const char *chip_name; -@@ -2392,7 +2396,11 @@ static int __devinit acxmem_probe(struct platform_device *pdev) +@@ -2392,7 +2396,11 @@ static int __devinit acxmem_probe(struct * pdev - ptr to PCI device structure containing info about pci * configuration */ @@ -40,7 +38,7 @@ index 87e01f1..f1ff7e2 100644 { struct ieee80211_hw *hw = (struct ieee80211_hw *) platform_get_drvdata(pdev); -@@ -2594,8 +2602,11 @@ static struct platform_driver acxmem_driver = { +@@ -2594,8 +2602,11 @@ static struct platform_driver acxmem_dri .name = "acx-mem", }, .probe = acxmem_probe, @@ -53,11 +51,9 @@ index 87e01f1..f1ff7e2 100644 #ifdef CONFIG_PM .suspend = acxmem_e_suspend, .resume = acxmem_e_resume -diff --git a/pci.c b/pci.c -index 1da31d1..ae07f5a 100644 --- a/pci.c +++ b/pci.c -@@ -1039,7 +1039,11 @@ int acx100pci_ioctl_set_phy_amp_bias(struct net_device *ndev, +@@ -1039,7 +1039,11 @@ int acx100pci_ioctl_set_phy_amp_bias(str * id - ptr to the device id entry that matched this device */ #ifdef CONFIG_PCI @@ -69,7 +65,7 @@ index 1da31d1..ae07f5a 100644 const struct pci_device_id *id) { unsigned long mem_region1 = 0; -@@ -1292,7 +1296,11 @@ static int __devinit acxpci_probe(struct pci_dev *pdev, +@@ -1292,7 +1296,11 @@ static int __devinit acxpci_probe(struct * * pdev - ptr to PCI device structure containing info about pci configuration */ @@ -81,7 +77,7 @@ index 1da31d1..ae07f5a 100644 { struct ieee80211_hw *hw = (struct ieee80211_hw *) pci_get_drvdata(pdev); -@@ -1505,7 +1513,11 @@ static struct pci_driver acxpci_driver = { +@@ -1505,7 +1513,11 @@ static struct pci_driver acxpci_driver = .name = "acx_pci", .id_table = acxpci_id_tbl, .probe = acxpci_probe, @@ -93,7 +89,7 @@ index 1da31d1..ae07f5a 100644 #ifdef CONFIG_PM .suspend = acxpci_e_suspend, .resume = acxpci_e_resume -@@ -1603,8 +1615,12 @@ static struct vlynq_device_id acx_vlynq_id[] = { +@@ -1603,8 +1615,12 @@ static struct vlynq_device_id acx_vlynq_ }; @@ -107,7 +103,7 @@ index 1da31d1..ae07f5a 100644 { int result = -EIO, i; u32 addr; -@@ -1785,7 +1801,11 @@ static __devinit int vlynq_probe(struct vlynq_device *vdev, +@@ -1785,7 +1801,11 @@ static __devinit int vlynq_probe(struct return result; } @@ -119,7 +115,7 @@ index 1da31d1..ae07f5a 100644 { struct ieee80211_hw *hw = vlynq_get_drvdata(vdev); acx_device_t *adev = hw2adev(hw); -@@ -1851,7 +1871,11 @@ static struct vlynq_driver acxvlynq_driver = { +@@ -1851,7 +1871,11 @@ static struct vlynq_driver acxvlynq_driv .name = "acx_vlynq", .id_table = acx_vlynq_id, .probe = vlynq_probe, @@ -131,6 +127,3 @@ index 1da31d1..ae07f5a 100644 }; #endif /* CONFIG_VLYNQ */ --- -1.8.4.rc1 - -- cgit v1.2.3