* linux-next: manual merge of the gpio tree with the leds tree
@ 2014-01-09 5:49 Stephen Rothwell
2014-01-09 5:52 ` Sachin Kamat
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-01-09 5:49 UTC (permalink / raw)
To: Linus Walleij, Bryan Wu
Cc: linux-next, linux-kernel, achin Kamat, Tushar Behera
[-- Attachment #1: Type: text/plain, Size: 936 bytes --]
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in
drivers/leds/leds-s3c24xx.c between commit cfc7937fb6bd ("leds: s3c24xx:
Remove hardware.h inclusion") from the leds tree and commit 224feb33a645
("leds: s3c24xx: Fix build failure") from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/leds/leds-s3c24xx.c
index b7876eb09e8c,87cf215af798..000000000000
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@@ -18,9 -18,11 +18,10 @@@
#include <linux/gpio.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include <linux/platform_data/leds-s3c24xx.h>
-#include <mach/hardware.h>
#include <mach/regs-gpio.h>
+ #include <plat/gpio-cfg.h>
-#include <linux/platform_data/leds-s3c24xx.h>
/* our context */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the gpio tree with the leds tree
2014-01-09 5:49 linux-next: manual merge of the gpio tree with the leds tree Stephen Rothwell
@ 2014-01-09 5:52 ` Sachin Kamat
0 siblings, 0 replies; 2+ messages in thread
From: Sachin Kamat @ 2014-01-09 5:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linus Walleij, Bryan Wu, linux-next, LKML, Tushar Behera
On 9 January 2014 11:19, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in
> drivers/leds/leds-s3c24xx.c between commit cfc7937fb6bd ("leds: s3c24xx:
> Remove hardware.h inclusion") from the leds tree and commit 224feb33a645
> ("leds: s3c24xx: Fix build failure") from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/leds/leds-s3c24xx.c
> index b7876eb09e8c,87cf215af798..000000000000
> --- a/drivers/leds/leds-s3c24xx.c
> +++ b/drivers/leds/leds-s3c24xx.c
> @@@ -18,9 -18,11 +18,10 @@@
> #include <linux/gpio.h>
> #include <linux/slab.h>
> #include <linux/module.h>
> +#include <linux/platform_data/leds-s3c24xx.h>
>
> -#include <mach/hardware.h>
> #include <mach/regs-gpio.h>
> + #include <plat/gpio-cfg.h>
> -#include <linux/platform_data/leds-s3c24xx.h>
>
> /* our context */
>
Looks good. Thanks Stephen.
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-09 5:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-09 5:49 linux-next: manual merge of the gpio tree with the leds tree Stephen Rothwell
2014-01-09 5:52 ` Sachin Kamat
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).