From 2d66598f415cb00b094e26656bf718856e293022 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 27 Jan 2013 21:16:35 +0000
Subject: [PATCH] acx-mac80211: make it compile with kernel 3.8

SVN-Revision: 35334
---
 package/acx-mac80211/Makefile                 | 10 +--
 .../patches/002-remove-usage-of__dev.patch    | 85 +++++++++++++++++++
 2 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 package/acx-mac80211/patches/002-remove-usage-of__dev.patch

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index d29cf407db..35f7e39eed 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -181,8 +181,6 @@ PKG_EXTRA_CFLAGS:= \
 	$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS -DCONFIG_MAC80211_DEBUGFS) \
 	$(if $(CONFIG_PACKAGE_MAC80211_MESH), -DCONFIG_MAC80211_MESH) \
 
-LINUX_AUTOCONF_FILE:= generated/autoconf.h
-
 define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
@@ -190,9 +188,11 @@ define Build/Compile
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		$(PKG_EXTRA_KCONFIG) \
 		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,8,0)\"" \
-		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
-			-Iarch/$(LINUX_KARCH)/include \
-			-include $(LINUX_AUTOCONF_FILE) \
+		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
+			-I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
+			-I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \
+			-Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \
+			-include generated/autoconf.h \
 			-include linux/compat-2.6.h" \
 		V="$(V)" \
 		modules
diff --git a/package/acx-mac80211/patches/002-remove-usage-of__dev.patch b/package/acx-mac80211/patches/002-remove-usage-of__dev.patch
new file mode 100644
index 0000000000..f16d3b68b1
--- /dev/null
+++ b/package/acx-mac80211/patches/002-remove-usage-of__dev.patch
@@ -0,0 +1,85 @@
+--- a/mem.c
++++ b/mem.c
+@@ -2002,7 +2002,7 @@ int acx100mem_ioctl_set_phy_amp_bias(str
+  *	  configuration
+  * id	- ptr to the device id entry that matched this device
+  */
+-static int __devinit acxmem_probe(struct platform_device *pdev)
++static int acxmem_probe(struct platform_device *pdev)
+ {
+ 	acx_device_t *adev = NULL;
+ 	const char *chip_name;
+@@ -2268,7 +2268,7 @@ done:
+  * pdev - ptr to PCI device structure containing info about pci
+  * configuration
+  */
+-static int __devexit acxmem_remove(struct platform_device *pdev)
++static int acxmem_remove(struct platform_device *pdev)
+ {
+ 	struct ieee80211_hw *hw = (struct ieee80211_hw *)
+ 		platform_get_drvdata(pdev);
+@@ -2470,7 +2470,7 @@ static struct platform_driver acxmem_dri
+ 		.name = "acx-mem",
+ 	},
+ 	.probe = acxmem_probe,
+-	.remove = __devexit_p(acxmem_remove),
++	.remove = acxmem_remove,
+ 
+ #ifdef CONFIG_PM
+ 	.suspend = acxmem_e_suspend,
+--- a/pci.c
++++ b/pci.c
+@@ -982,7 +982,7 @@ int acx100pci_ioctl_set_phy_amp_bias(str
+  * id	- ptr to the device id entry that matched this device
+  */
+ #ifdef CONFIG_PCI
+-static int __devinit acxpci_probe(struct pci_dev *pdev,
++static int acxpci_probe(struct pci_dev *pdev,
+ 				const struct pci_device_id *id)
+ {
+ 	acx111_ie_configoption_t co;
+@@ -1346,7 +1346,7 @@ done:
+  *
+  * pdev - ptr to PCI device structure containing info about pci configuration
+  */
+-static void __devexit acxpci_remove(struct pci_dev *pdev)
++static void acxpci_remove(struct pci_dev *pdev)
+ {
+ 	struct ieee80211_hw *hw
+ 		= (struct ieee80211_hw *) pci_get_drvdata(pdev);
+@@ -1537,7 +1537,7 @@ static int acxpci_e_resume(struct pci_de
+  */
+ 
+ #if 0 // use later ?
+-static struct acxpci_device_info acxpci_info_tbl[] __devinitdata = {
++static struct acxpci_device_info acxpci_info_tbl[] = {
+         [0] = {
+                 .part_name      = "acx111",
+                 .helper_image   = "tiacx1111r16", // probly wrong !!
+@@ -1564,7 +1564,7 @@ static struct pci_driver acxpci_driver =
+ 	.name		= "acx_pci",
+ 	.id_table	= acxpci_id_tbl,
+ 	.probe		= acxpci_probe,
+-	.remove		= __devexit_p(acxpci_remove),
++	.remove		= acxpci_remove,
+ #ifdef CONFIG_PM
+ 	.suspend	= acxpci_e_suspend,
+ 	.resume		= acxpci_e_resume
+@@ -1662,7 +1662,7 @@ static struct vlynq_device_id acx_vlynq_
+ };
+ 
+ 
+-static __devinit int vlynq_probe(struct vlynq_device *vdev,
++static int vlynq_probe(struct vlynq_device *vdev,
+ 				 struct vlynq_device_id *id)
+ {
+ 	int result = -EIO, i;
+@@ -1971,7 +1971,7 @@ static struct vlynq_driver vlynq_acx = {
+ 	.name = "acx_vlynq",
+ 	.id_table = acx_vlynq_id,
+ 	.probe = vlynq_probe,
+-	.remove = __devexit_p(vlynq_remove),
++	.remove = vlynq_remove,
+ };
+ #endif /* CONFIG_VLYNQ */
+ 
-- 
2.30.2