* linux-next: manual merge of the mfd tree with the hwmon-staging tree
@ 2014-09-25 4:08 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-25 4:08 UTC (permalink / raw)
To: Lee Jones, Guenter Roeck, Guodong Xu
Cc: linux-next, linux-kernel, Andreas Werner
[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]
Hi Lee,
Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Makefile between commit dfbdcd7cefca ("mfd: menf21bmc:
Introduce MEN 14F021P00 BMC MFD Core driver") from the hwmon-staging
tree and commit bc69ade0238e ("mfd: Add HI6421 PMIC Core driver") from
the mfd 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/mfd/Makefile
index d58068aa8aa9,f1b2e2c9264e..000000000000
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -169,7 -171,7 +171,8 @@@ obj-$(CONFIG_MFD_AS3711) += as3711.
obj-$(CONFIG_MFD_AS3722) += as3722.o
obj-$(CONFIG_MFD_STW481X) += stw481x.o
obj-$(CONFIG_MFD_IPAQ_MICRO) += ipaq-micro.o
+obj-$(CONFIG_MFD_MENF21BMC) += menf21bmc.o
+ obj-$(CONFIG_MFD_HI6421_PMIC) += hi6421-pmic-core.o
intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-25 4:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-25 4:08 linux-next: manual merge of the mfd tree with the hwmon-staging tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox