aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-11-19 10:43:08 +0100
committerMathias Kresin <dev@kresin.me>2017-11-22 08:21:53 +0100
commit298ade22a030459fcd90593032af9f1e5da37c77 (patch)
treef0b42395d8c2b485be0672daebafce010841cfb8
parentaa82141d9be0bbac5bf7c8b82fe1b1581e679587 (diff)
downloadupstream-298ade22a030459fcd90593032af9f1e5da37c77.tar.gz
upstream-298ade22a030459fcd90593032af9f1e5da37c77.tar.bz2
upstream-298ade22a030459fcd90593032af9f1e5da37c77.zip
acx-mac80211: fix build on kernel 4.9
The DEFINE_PCI_DEVICE_TABLE macro was removed with upstream commit 7e9321599011 ("treewide: remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE"). Use the pci_device_id struct to fix the acx-mac80211 build failure on ramips. Signed-off-by: Mathias Kresin <dev@kresin.me>
-rw-r--r--package/kernel/acx-mac80211/patches/100-compat.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/kernel/acx-mac80211/patches/100-compat.patch b/package/kernel/acx-mac80211/patches/100-compat.patch
new file mode 100644
index 0000000000..6fcab5ea43
--- /dev/null
+++ b/package/kernel/acx-mac80211/patches/100-compat.patch
@@ -0,0 +1,16 @@
+diff --git a/pci.c b/pci.c
+index ae07f5a..72d542f 100644
+--- a/pci.c
++++ b/pci.c
+@@ -1495,7 +1495,11 @@ static struct acxpci_device_info acxpci_info_tbl[] __devinitdata = {
+ #endif
+
+ #ifdef CONFIG_PCI
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
+ static DEFINE_PCI_DEVICE_TABLE(acxpci_id_tbl) = {
++#else
++static const struct pci_device_id acxpci_id_tbl[] = {
++#endif
+ { PCI_VDEVICE(TI, PCI_DEVICE_ID_TI_TNETW1100A),
+ .driver_data = CHIPTYPE_ACX100,
+ },