| From 5b235dc2647e4977b17b5c41d959d0f455831c3f Mon Sep 17 00:00:00 2001 |
| From: Alban Bedel <albeu@free.fr> |
| Date: Fri, 4 Sep 2015 14:29:16 +0200 |
| Subject: MIPS: Fix the build on jz4740 after removing the custom gpio.h |
| |
| From: Alban Bedel <albeu@free.fr> |
| |
| commit 5b235dc2647e4977b17b5c41d959d0f455831c3f 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> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/mips/jz4740/board-qi_lb60.c | 1 + |
| arch/mips/jz4740/gpio.c | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| --- a/arch/mips/jz4740/board-qi_lb60.c |
| +++ b/arch/mips/jz4740/board-qi_lb60.c |
| @@ -26,6 +26,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> |
| --- 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" |
| |
