linux-next: manual merge of the moduleh tree with the mfd tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
include/linux/mfd/abx500/ab8500.h between commit 0f6208375951 ("mfd: Add
ab8500 version detection and enforcing") from the mfd tree and commit
3a55cc4f6e53 ("device.h: audit and cleanup users in main include dir")
from the moduleh tree.

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

diff --cc include/linux/mfd/abx500/ab8500.h
index 4b2df29,dca9439..0000000
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@@ -7,31 -7,11 +7,34 @@@
  #ifndef MFD_AB8500_H
  #define MFD_AB8500_H
  
- #include <linux/device.h>
+ #include <linux/mutex.h>
+ 
+ struct device;
+ 
  /*
 + * AB IC versions
 + *
 + * AB8500_VERSION_AB8500 should be 0xFF but will never be read as need a
 + * non-supported multi-byte I2C access via PRCMU. Set to 0x00 to ease the
 + * print of version string.
 + */
 +enum ab8500_version {
 +	AB8500_VERSION_AB8500 = 0x0,
 +	AB8500_VERSION_AB8505 = 0x1,
 +	AB8500_VERSION_AB9540 = 0x2,
 +	AB8500_VERSION_AB8540 = 0x3,
 +	AB8500_VERSION_UNDEFINED,
 +};
 +
 +/* AB8500 CIDs*/
 +#define AB8500_CUTEARLY	0x00
 +#define AB8500_CUT1P0	0x10
 +#define AB8500_CUT1P1	0x11
 +#define AB8500_CUT2P0	0x20
 +#define AB8500_CUT3P0	0x30
 +#define AB8500_CUT3P3	0x33
 +
 +/*
   * AB8500 bank addresses
   */
  #define AB8500_SYS_CTRL1_BLOCK	0x1

Attachment: pgp00000.pgp
Description: PGP signature