Merge commit 'v2.6.27-rc7' into x86/debug

1 files changed, 12 insertions, 6 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 1fcaf3284a6a..4c9890ec2528 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
                                 struct module *mod)
 {
         const unsigned long id_size = sizeof(struct pnp_device_id);
-        const struct pnp_device_id *id = symval;
+        const unsigned int count = (size / id_size)-1;
+        const struct pnp_device_id *devs = symval;
+        unsigned int i;
 
         device_id_check(mod->name, "pnp", size, id_size, symval);
 
-        buf_printf(&mod->dev_table_buf,
-                   "MODULE_ALIAS(\"pnp:d%s*\");\n", id->id);
-        buf_printf(&mod->dev_table_buf,
-                   "MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id);
+        for (i = 0; i < count; i++) {
+                const char *id = (char *)devs[i].id;
+
+                buf_printf(&mod->dev_table_buf,
+                           "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
+                buf_printf(&mod->dev_table_buf,
+                           "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
+        }
 }
 
 /* looks like: "pnp:dD" for every device of the card */
@@ -623,7 +629,7 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
         return 1;
 }
 
-/* Ignore any prefix, eg. v850 prepends _ */
+/* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
         const char *match;