Merge commit 'v2.6.32' into reiserfs/kill-bkl

Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.

1 files changed, 13 insertions, 0 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 40e0045876ee..62a9025cdcc7 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -657,6 +657,15 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
         return 1;
 }
 
+/* Looks like: spi:S */
+static int do_spi_entry(const char *filename, struct spi_device_id *id,
+                        char *alias)
+{
+        sprintf(alias, SPI_MODULE_PREFIX "%s", id->name);
+
+        return 1;
+}
+
 static const struct dmifield {
         const char *prefix;
         int field;
@@ -853,6 +862,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct i2c_device_id), "i2c",
                          do_i2c_entry, mod);
+        else if (sym_is(symname, "__mod_spi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct spi_device_id), "spi",
+                         do_spi_entry, mod);
         else if (sym_is(symname, "__mod_dmi_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct dmi_system_id), "dmi",