From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0b4976e2934f961cda0805e5438d1b8349808447
Date: Tue, 20 Jun 2017 05:17:08 +0100 [thread overview]
Message-ID: <20170620041708.D9C491081DE1@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2463 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 0b4976e2934f961cda0805e5438d1b8349808447 (commit)
from ad73e5ec63d946dfd8c2c2543d74778391aabc58 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0b4976e2934f961cda0805e5438d1b8349808447
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Jun 20 06:12:45 2017 +0200
kernel: fix amba modules build with gcc6
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/linux | 2 ++
src/patches/linux/linux-3.14.79-amba-fix.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
create mode 100644 src/patches/linux/linux-3.14.79-amba-fix.patch
Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 2900c99..b3ccb7a 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 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;
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2017-06-20 4:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170620041708.D9C491081DE1@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox