From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Jan 2012 20:32:16 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://github.com/rustyrussell/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999  BFCB D920 0E6C D1AD B8F1

* tag 'for-linus' of git://github.com/rustyrussell/linux:
  module_param: check that bool parameters really are bool.
  intelfbdrv.c: bailearly is an int module_param
  paride/pcd: fix bool verbose module parameter.
  module_param: make bool parameters really bool (drivers & misc)
  module_param: make bool parameters really bool (arch)
  module_param: make bool parameters really bool (core code)
  kernel/async: remove redundant declaration.
  printk: fix unnecessary module_param_name.
  lirc_parallel: fix module parameter description.
  module_param: avoid bool abuse, add bint for special cases.
  module_param: check type correctness for module_param_array
  modpost: use linker section to generate table.
  modpost: use a table rather than a giant if/else statement.
  modules: sysfs - export: taint, coresize, initsize
  kernel/params: replace DEBUGP with pr_debug
  module: replace DEBUGP with pr_debug
  module: struct module_ref should contains long fields
  module: Fix performance regression on modules with large symbol tables
  module: Add comments describing how the "strmap" logic works

Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
generated table approach to adding __mod_*_device_table entries.  The
ARM sa11x0 mcp bus needed to be converted to that too.
---

0a80939b3e6af4b0dc93bf88ec02fd7e90a16f1b
diff --cc scripts/mod/file2alias.c
index 296f17ff751b,e8c969577768..c0e14b3f2306
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@@ -773,16 -821,8 +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;