]>
Commit | Line | Data |
---|---|---|
17d72646 GKH |
1 | From 5b235dc2647e4977b17b5c41d959d0f455831c3f Mon Sep 17 00:00:00 2001 |
2 | From: Alban Bedel <albeu@free.fr> | |
3 | Date: Fri, 4 Sep 2015 14:29:16 +0200 | |
4 | Subject: MIPS: Fix the build on jz4740 after removing the custom gpio.h | |
5 | ||
6 | From: Alban Bedel <albeu@free.fr> | |
7 | ||
8 | commit 5b235dc2647e4977b17b5c41d959d0f455831c3f upstream. | |
9 | ||
10 | Somehow the wrong version of the patch to remove the use of custom | |
11 | gpio.h on mips has been merged. This patch add the missing fixes for a | |
12 | build error on jz4740 because linux/gpio.h doesn't provide any machine | |
13 | specfics definitions anymore. | |
14 | ||
15 | Signed-off-by: Alban Bedel <albeu@free.fr> | |
16 | Cc: Paul Burton <paul.burton@imgtec.com> | |
17 | Cc: Lars-Peter Clausen <lars@metafoo.de> | |
18 | Cc: Brian Norris <computersforpeace@gmail.com> | |
19 | Cc: Thomas Gleixner <tglx@linutronix.de> | |
20 | Cc: Linus Walleij <linus.walleij@linaro.org> | |
21 | Cc: linux-mips@linux-mips.org | |
22 | Cc: linux-kernel@vger.kernel.org | |
23 | Patchwork: https://patchwork.linux-mips.org/patch/11089/ | |
24 | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> | |
25 | Cc: Arnd Bergmann <arnd@arndb.de> | |
26 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
27 | ||
28 | --- | |
29 | arch/mips/jz4740/board-qi_lb60.c | 1 + | |
30 | arch/mips/jz4740/gpio.c | 1 + | |
31 | 2 files changed, 2 insertions(+) | |
32 | ||
33 | --- a/arch/mips/jz4740/board-qi_lb60.c | |
34 | +++ b/arch/mips/jz4740/board-qi_lb60.c | |
35 | @@ -26,6 +26,7 @@ | |
36 | #include <linux/power/jz4740-battery.h> | |
37 | #include <linux/power/gpio-charger.h> | |
38 | ||
39 | +#include <asm/mach-jz4740/gpio.h> | |
40 | #include <asm/mach-jz4740/jz4740_fb.h> | |
41 | #include <asm/mach-jz4740/jz4740_mmc.h> | |
42 | #include <asm/mach-jz4740/jz4740_nand.h> | |
43 | --- a/arch/mips/jz4740/gpio.c | |
44 | +++ b/arch/mips/jz4740/gpio.c | |
45 | @@ -27,6 +27,7 @@ | |
46 | #include <linux/seq_file.h> | |
47 | ||
48 | #include <asm/mach-jz4740/base.h> | |
49 | +#include <asm/mach-jz4740/gpio.h> | |
50 | ||
51 | #include "irq.h" | |
52 |