linux-next: manual merge of the mfd tree with Linus' tree

[Stephen Rothwell]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/Makefile between commits dece3709b71a ("mfd/db5500-prcmu:
delete DB5500 PRCMU support") and 72fb92200d6c ("mfd/ab5500: delete
AB5500 support") from Linus' tree and commit d28f1db8187d ("mfd: Remove
confusing ab8500-i2c file and merge into ab8500-core") from the mfd tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mfd/Makefile
index 43672b8,afe96b2..0000000
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@@ -87,12 -91,14 +91,11 @@@ obj-$(CONFIG_PCF50633_GPIO)	+= pcf50633
  obj-$(CONFIG_ABX500_CORE)	+= abx500-core.o
  obj-$(CONFIG_AB3100_CORE)	+= ab3100-core.o
  obj-$(CONFIG_AB3100_OTP)	+= ab3100-otp.o
  obj-$(CONFIG_AB8500_DEBUG)	+= ab8500-debugfs.o
  obj-$(CONFIG_AB8500_GPADC)	+= ab8500-gpadc.o
  obj-$(CONFIG_MFD_DB8500_PRCMU)	+= db8500-prcmu.o
- # ab8500-i2c need to come after db8500-prcmu (which provides the channel)
- obj-$(CONFIG_AB8500_I2C_CORE)	+= ab8500-i2c.o
+ # ab8500-core need to come after db8500-prcmu (which provides the channel)
+ obj-$(CONFIG_AB8500_CORE)	+= ab8500-core.o ab8500-sysctrl.o
 -obj-$(CONFIG_MFD_DB5500_PRCMU)	+= db5500-prcmu.o
  obj-$(CONFIG_MFD_TIMBERDALE)    += timberdale.o
  obj-$(CONFIG_PMIC_ADP5520)	+= adp5520.o
  obj-$(CONFIG_LPC_SCH)		+= lpc_sch.o

Attachment: pgp00000.pgp
Description: PGP signature