[<prev] [next>] [day] [month] [year] [list]
Date: Thu, 12 Jan 2012 12:06:52 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Samuel Ortiz <sameo@...ux.intel.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Donggeun Kim <dg77.kim@...sung.com>,
MyungJoo Ham <myungjoo.ham@...sung.com>,
Kyungmin Park <kyungmin.park@...sung.com>,
NeilBrown <neilb@...e.de>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the mfd tree with Linus' tree
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@...b.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists