From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>, Bryan Wu <cooloney@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
achin Kamat <sachin.kamat@linaro.org>,
Tushar Behera <tushar.behera@linaro.org>
Subject: linux-next: manual merge of the gpio tree with the leds tree
Date: Thu, 9 Jan 2014 16:49:48 +1100 [thread overview]
Message-ID: <20140109164948.6a7341cfbd92258bc8d522e3@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-01-09 5:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-09 5:49 Stephen Rothwell [this message]
2014-01-09 5:52 ` Sachin Kamat
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=20140109164948.6a7341cfbd92258bc8d522e3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cooloney@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sachin.kamat@linaro.org \
--cc=tushar.behera@linaro.org \
/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
all inboxes | Powered by JetHome®