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

[Stephen Rothwell]

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
scripts/mod/file2alias.c between commits f5385e2664e7 ("modpost: use a
table rather than a giant if/else statement") and c89845fbf083 ("modpost:
use linker section to generate table") from the rr tree and commit
6837bbf06393 ("ARM: sa11x0: Implement autoloading of codec and codec
pdata for mcp bus") from the mfd tree.

I fixed it up (see below - the rest of the change to this file from the
mfd tree is removed) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc scripts/mod/file2alias.c
index c1057bd,e8c7eb1..0000000
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@@ -821,8 -773,16 +821,18 @@@ static int do_spi_entry(const char *fil
  
  	return 1;
  }
 +ADD_TO_DEVTABLE("spi", struct spi_device_id, do_spi_entry);
  
+ /* Looks like: mcp:S */
+ static int do_mcp_entry(const char *filename, struct mcp_device_id *id,
+ 			char *alias)
+ {
+ 	sprintf(alias, MCP_MODULE_PREFIX "%s", id->name);
+ 
+ 	return 1;
+ }
++ADD_TO_DEVTABLE("mcp", struct mcp_device_id, do_mcp_entry);
+ 
  static const struct dmifield {
  	const char *prefix;
  	int field;

Attachment: pgp00000.pgp
Description: PGP signature