From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 20 Jun 2017 04:12:45 +0000 (+0200)
Subject: kernel: fix amba modules build with gcc6
X-Git-Tag: v2.19-core112~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b4976e2934f961cda0805e5438d1b8349808447;p=people%2Fstevee%2Fipfire-2.x.git

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 2900c99005..b3ccb7af9a 100644
--- 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
index 0000000000..a2cb732642
--- /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;