kernel: fix amba modules build with gcc6

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/linux b/lfs/linux
index 2900c99005cf74fc2fe8fee2d70b88c79b49eadc..b3ccb7af9a74dfbcda67d4f9f01be13b6853ba49 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -241,6 +241,8 @@ ifeq "$(KCFG)" "-rpi"
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-rpi-suspend-not-inline.patch
 endif
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
+
 ifeq "$(KCFG)" "-headers"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install

diff --git a/src/patches/linux/linux-3.14.79-amba-fix.patch b/src/patches/linux/linux-3.14.79-amba-fix.patch
new file mode 100644 (file)
index 0000000..a2cb732
--- /dev/null
+++ b/src/patches/linux/linux-3.14.79-amba-fix.patch
@@ -0,0 +1,11 @@
+diff -Naur linux-3.14.79.ORG/include/linux/mod_devicetable.h linux-3.14.79/include/linux/mod_devicetable.h
+--- linux-3.14.79.ORG/include/linux/mod_devicetable.h  2017-06-16 19:58:41.000000000 +0200
++++ linux-3.14.79/include/linux/mod_devicetable.h      2017-06-19 19:40:59.374205140 +0200
+@@ -538,6 +538,7 @@
+  *    == id.
+  * @data: Private data used by the driver.
+  */
++#define amba_device_id amba_id
+ struct amba_id {
+       unsigned int            id;
+       unsigned int            mask;