From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Samuel Ortiz <sameo@linux•intel.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Donggeun Kim <dg77.kim@samsung•com>,
MyungJoo Ham <myungjoo.ham@samsung•com>,
Kyungmin Park <kyungmin.park@samsung•com>,
NeilBrown <neilb@suse•de>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the mfd tree with Linus' tree
Date: Thu, 12 Jan 2012 12:06:52 +1100 [thread overview]
Message-ID: <20120112120652.cdc2db032dcedfd402e61b34@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1342 bytes --]
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/leds/Kconfig between commit a6d511e51554 ("leds: add driver for
TCA6507 LED controller") from Linus' tree and commit 8584cb82f151 ("leds:
Add suuport for MAX8997-LED driver") from the mfd tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/leds/Kconfig
index 897a77d,c0e30e8..0000000
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -388,14 -387,13 +388,21 @@@ config LEDS_RENESAS_TP
pin function. The latter to support brightness control.
Brightness control is supported but hardware blinking is not.
+config LEDS_TCA6507
+ tristate "LED Support for TCA6507 I2C chip"
+ depends on LEDS_CLASS && I2C
+ help
+ This option enables support for LEDs connected to TC6507
+ LED driver chips accessed via the I2C bus.
+ Driver support brightness control and hardware-assisted blinking.
+
+ config LEDS_MAX8997
+ tristate "LED support for MAX8997 PMIC"
+ depends on LEDS_CLASS && MFD_MAX8997
+ help
+ This option enables support for on-chip LED drivers on
+ MAXIM MAX8997 PMIC.
+
config LEDS_TRIGGERS
bool "LED Trigger support"
depends on LEDS_CLASS
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-01-12 1:07 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-12 1:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-16 2:15 linux-next: manual merge of the mfd tree with Linus' tree Stephen Rothwell
2023-03-05 22:49 Stephen Rothwell
2019-06-11 4:31 Stephen Rothwell
2019-05-09 2:44 Stephen Rothwell
2019-02-08 2:37 Stephen Rothwell
2019-02-08 8:33 ` Jarkko Nikula
2018-08-17 0:39 Stephen Rothwell
2018-08-21 8:08 ` Geert Uytterhoeven
2018-08-21 8:30 ` Stephen Rothwell
2018-08-28 13:34 ` Geert Uytterhoeven
2018-08-28 21:45 ` Stephen Rothwell
2018-03-08 1:33 Stephen Rothwell
2018-03-08 8:12 ` Lee Jones
2014-11-13 1:47 Stephen Rothwell
2012-11-28 3:20 Stephen Rothwell
2012-10-03 4:12 Stephen Rothwell
2012-09-18 3:19 Stephen Rothwell
2012-09-18 7:31 ` Dong Aisheng
2012-09-12 2:49 Stephen Rothwell
2012-07-25 1:18 Stephen Rothwell
2012-07-25 6:40 ` Laxman Dewangan
2012-05-23 3:01 Stephen Rothwell
2012-05-22 4:14 Stephen Rothwell
2012-05-22 4:10 Stephen Rothwell
2012-03-23 3:32 Stephen Rothwell
2012-03-23 9:41 ` Samuel Ortiz
2012-03-24 17:31 ` Grant Likely
2012-03-26 8:25 ` Samuel Ortiz
2012-03-28 22:47 ` Grant Likely
2011-09-09 4:22 Stephen Rothwell
2011-03-21 1:26 Stephen Rothwell
2011-03-21 8:21 ` Linus Walleij
2011-03-22 11:16 ` Samuel Ortiz
2011-03-23 17:57 ` Linus Walleij
2011-03-22 11:08 ` Samuel Ortiz
2010-09-13 1:54 Stephen Rothwell
2010-09-13 13:59 ` Samuel Ortiz
2010-08-12 4:41 Stephen Rothwell
2010-08-12 9:51 ` Samuel Ortiz
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=20120112120652.cdc2db032dcedfd402e61b34@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dg77.kim@samsung$(echo .)com \
--cc=kyungmin.park@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=myungjoo.ham@samsung$(echo .)com \
--cc=neilb@suse$(echo .)de \
--cc=sameo@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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