From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Samuel Ortiz <sameo@openedhand•com>
Cc: linux-next@vger•kernel.org,
David Brownell <dbrownell@users•sourceforge.net>,
Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the mfd tree
Date: Tue, 6 Jan 2009 16:14:09 +1100 [thread overview]
Message-ID: <20090106161409.da9932a2.sfr@canb.auug.org.au> (raw)
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
drivers/i2c/chips/Makefile between commit
a234ae259954121886f7f589a9cf1915d6dfab88 ("USB: move isp1301_omap to
drivers/usb/otg") from the usb tree and commits
87c13493e6a59c0da55c2824f0205f9ef941b760 ("mfd: move
drivers/i2c/chips/tps65010.c to drivers/mfd") and
88e75cc347f66bc20e3c2b920431fc07253d69be ("mfd: move
drivers/i2c/chips/menelaus.c to drivers/mfd") from the mfd tree.
Again, just adjacent removals. I fixed it up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/i2c/chips/Makefile
index aa7552d,8b95f41..0000000
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@@ -18,8 -18,7 +18,6 @@@ obj-$(CONFIG_SENSORS_PCA9539) += pca953
obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
obj-$(CONFIG_PCF8575) += pcf8575.o
obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
- obj-$(CONFIG_TPS65010) += tps65010.o
- obj-$(CONFIG_MENELAUS) += menelaus.o
-obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o
next reply other threads:[~2009-01-06 5:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-06 5:14 Stephen Rothwell [this message]
2009-01-06 17:55 ` linux-next: manual merge of the mfd tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2009-01-06 5:11 Stephen Rothwell
2009-01-06 17:54 ` Greg KH
2008-10-15 9:30 Stephen Rothwell
2008-10-15 14:33 ` Samuel Ortiz
2008-07-08 7:11 Stephen Rothwell
2008-07-10 0:11 ` Samuel Ortiz
2008-07-10 0:42 ` Stephen Rothwell
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=20090106161409.da9932a2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dbrownell@users$(echo .)sourceforge.net \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sameo@openedhand$(echo .)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