[source] acx-mac80211: fix build on kernel 4.9

LEDE Commits lede-commits at lists.infradead.org
Tue Nov 21 23:31:55 PST 2017


mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/298ade22a030459fcd90593032af9f1e5da37c77

commit 298ade22a030459fcd90593032af9f1e5da37c77
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sun Nov 19 10:43:08 2017 +0100

    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 at kresin.me>
---
 package/kernel/acx-mac80211/patches/100-compat.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 0000000..6fcab5e
--- /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,
+ 	},



More information about the lede-commits mailing list