From: Arnd Bergmann <arnd@arndb.de>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: stable@vger.kernel.org, Alban Bedel <albeu@free.fr>,
Paul Burton <paul.burton@imgtec.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Brian Norris <computersforpeace@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
Linus Walleij <linus.walleij@linaro.org>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
Ralf Baechle <ralf@linux-mips.org>, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH 3.16-stable 85/87] MIPS: Fix the build on jz4740 after removing the custom gpio.h
Date: Fri, 5 May 2017 21:47:43 +0200 [thread overview]
Message-ID: <20170505194745.3627137-86-arnd@arndb.de> (raw)
In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de>
From: Alban Bedel <albeu@free.fr>
Commit 8293821972679f185562c9d2bfadd897fac40243 upstream.
Somehow the wrong version of the patch to remove the use of custom
gpio.h on mips has been merged. This patch add the missing fixes for a
build error on jz4740 because linux/gpio.h doesn't provide any machine
specfics definitions anymore.
Signed-off-by: Alban Bedel <albeu@free.fr>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11089/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/mips/jz4740/board-qi_lb60.c | 1 +
arch/mips/jz4740/gpio.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index 088e92a79ae6..7da9ff143499 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -25,6 +25,7 @@
#include <linux/power/jz4740-battery.h>
#include <linux/power/gpio-charger.h>
+#include <asm/mach-jz4740/gpio.h>
#include <asm/mach-jz4740/jz4740_fb.h>
#include <asm/mach-jz4740/jz4740_mmc.h>
#include <asm/mach-jz4740/jz4740_nand.h>
diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c
index 00b798d2fb7c..000d2d91b704 100644
--- a/arch/mips/jz4740/gpio.c
+++ b/arch/mips/jz4740/gpio.c
@@ -27,6 +27,7 @@
#include <linux/seq_file.h>
#include <asm/mach-jz4740/base.h>
+#include <asm/mach-jz4740/gpio.h>
#include "irq.h"
--
2.9.0
prev parent reply other threads:[~2017-05-05 19:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170505194745.3627137-1-arnd@arndb.de>
2017-05-05 19:47 ` [PATCH 3.16-stable 72/87] x86/boot: Add CONFIG_PARAVIRT_SPINLOCKS quirk to arch/x86/boot/compressed/misc.h Arnd Bergmann
2017-05-05 19:47 ` [PATCH 3.16-stable 82/87] MIPS: ip27: Disable qlge driver in defconfig Arnd Bergmann
2017-11-06 19:08 ` Ben Hutchings
2017-05-05 19:47 ` [PATCH 3.16-stable 83/87] MIPS: ip22: Fix ip28 build for modern gcc Arnd Bergmann
2017-05-05 19:47 ` Arnd Bergmann [this message]
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=20170505194745.3627137-86-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=albeu@free.fr \
--cc=ben@decadent.org.uk \
--cc=computersforpeace@gmail.com \
--cc=lars@metafoo.de \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).