linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] MIPS: jz4740: Add missing gpio.h include
@ 2015-10-05 11:29 Thierry Reding
  2015-10-05 13:18 ` Alban
  0 siblings, 1 reply; 4+ messages in thread
From: Thierry Reding @ 2015-10-05 11:29 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: Lars-Peter Clausen, linux-mips, linux-kernel, Thierry Reding

Commit 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h") was
incomplete in that it didn't replace any of the includes for the JZ4740
platform and thus broke the qi_lb60_defconfig build.

Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
---
 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 4e62bf85d0b0..f2885adda9d0 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -35,6 +35,7 @@
 
 #include <linux/leds_pwm.h>
 
+#include <asm/mach-jz4740/gpio.h>
 #include <asm/mach-jz4740/platform.h>
 
 #include "clock.h"
diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c
index 6cd69fdaa1c5..386626376b18 100644
--- a/arch/mips/jz4740/gpio.c
+++ b/arch/mips/jz4740/gpio.c
@@ -28,6 +28,7 @@
 #include <linux/seq_file.h>
 
 #include <asm/mach-jz4740/base.h>
+#include <asm/mach-jz4740/gpio.h>
 
 #define JZ4740_GPIO_BASE_A (32*0)
 #define JZ4740_GPIO_BASE_B (32*1)
-- 
2.5.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: jz4740: Add missing gpio.h include
  2015-10-05 11:29 [PATCH] MIPS: jz4740: Add missing gpio.h include Thierry Reding
@ 2015-10-05 13:18 ` Alban
  2015-10-05 13:29   ` Thierry Reding
  0 siblings, 1 reply; 4+ messages in thread
From: Alban @ 2015-10-05 13:18 UTC (permalink / raw)
  To: Thierry Reding
  Cc: Ralf Baechle, Lars-Peter Clausen, linux-mips, linux-kernel, Alban

Am Mon,  5 Oct 2015 13:29:31 +0200
schrieb Thierry Reding <thierry.reding@gmail.com>:

> Commit 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h") was
> incomplete in that it didn't replace any of the includes for the JZ4740
> platform and thus broke the qi_lb60_defconfig build.

The fix for this break has just been merged upstream yesterday.

Alban

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: jz4740: Add missing gpio.h include
  2015-10-05 13:18 ` Alban
@ 2015-10-05 13:29   ` Thierry Reding
  2015-10-06 11:29     ` Ralf Baechle
  0 siblings, 1 reply; 4+ messages in thread
From: Thierry Reding @ 2015-10-05 13:29 UTC (permalink / raw)
  To: Alban; +Cc: Ralf Baechle, Lars-Peter Clausen, linux-mips, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

On Mon, Oct 05, 2015 at 03:18:03PM +0200, Alban wrote:
> Am Mon,  5 Oct 2015 13:29:31 +0200
> schrieb Thierry Reding <thierry.reding@gmail.com>:
> 
> > Commit 832f5dacfa0b ("MIPS: Remove all the uses of custom gpio.h") was
> > incomplete in that it didn't replace any of the includes for the JZ4740
> > platform and thus broke the qi_lb60_defconfig build.
> 
> The fix for this break has just been merged upstream yesterday.

Okay, great.

Thanks,
Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: jz4740: Add missing gpio.h include
  2015-10-05 13:29   ` Thierry Reding
@ 2015-10-06 11:29     ` Ralf Baechle
  0 siblings, 0 replies; 4+ messages in thread
From: Ralf Baechle @ 2015-10-06 11:29 UTC (permalink / raw)
  To: Thierry Reding; +Cc: Alban, Lars-Peter Clausen, linux-mips, linux-kernel

On Mon, Oct 05, 2015 at 03:29:34PM +0200, Thierry Reding wrote:

> > > platform and thus broke the qi_lb60_defconfig build.
> > 
> > The fix for this break has just been merged upstream yesterday.
> 
> Okay, great.

So I dropped this one.

  Ralf

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-10-06 11:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-05 11:29 [PATCH] MIPS: jz4740: Add missing gpio.h include Thierry Reding
2015-10-05 13:18 ` Alban
2015-10-05 13:29   ` Thierry Reding
2015-10-06 11:29     ` Ralf Baechle

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).