From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Liam Girdwood <lrg@slimlogic•co.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Santosh Shilimkar <santosh.shilimkar@ti•com>,
Samuel Ortiz <sameo@linux•intel.com>,
Wolfram Sang <w.sang@pengutronix•de>
Subject: linux-next: manual merge of the voltage tree with Linus' tree
Date: Tue, 15 Dec 2009 12:59:29 +1100 [thread overview]
Message-ID: <20091215125929.51e236a2.sfr@canb.auug.org.au> (raw)
Hi Liam,
Today's linux-next merge of the voltage tree got a conflict in
drivers/regulator/Makefile between commit
b07682b6056eb6701f8cb86aa5800e6f2ea7919b ("mfd: Rename twl4030* driver
files to enable re-use") from Linus' tree and commit
9c4d460f13b7d81abb26449a3920638889a3e5ed ("regulator: add driver for
MAX8660/8661") from the voltage tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/regulator/Makefile
index 9ae3cc4,2cf98a7..0000000
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -11,7 -11,8 +11,8 @@@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUM
obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
+ obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o
-obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o
+obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
next reply other threads:[~2009-12-15 1:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 1:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-12-15 2:38 linux-next: manual merge of the voltage tree with Linus' tree Stephen Rothwell
2009-12-15 9:48 ` Liam Girdwood
2009-12-15 12:14 ` Liam Girdwood
2009-12-15 14:04 ` Juha Keski-Saari
2009-12-15 14:23 ` Peter Ujfalusi
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=20091215125929.51e236a2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lrg@slimlogic$(echo .)co.uk \
--cc=sameo@linux$(echo .)intel.com \
--cc=santosh.shilimkar@ti$(echo .)com \
--cc=w.sang@pengutronix$(echo .)de \
/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