Merge upstream into 'upstream' branch of netdev-2.6.git.

Hand fix merge conflict in drivers/net/tokenring/Kconfig.

1 files changed, 7 insertions, 2 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 9b9f94c915d2..09ffca54b373 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -359,11 +359,16 @@ handle_modversions(struct module *mod, struct elf_info *info,
                 /* ignore __this_module, it will be resolved shortly */
                 if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
                         break;
-#ifdef STT_REGISTER
+/* cope with newer glibc (2.3.4 or higher) STT_ definition in elf.h */
+#if defined(STT_REGISTER) || defined(STT_SPARC_REGISTER)
+/* add compatibility with older glibc */
+#ifndef STT_SPARC_REGISTER
+#define STT_SPARC_REGISTER STT_REGISTER
+#endif
                 if (info->hdr->e_machine == EM_SPARC ||
                     info->hdr->e_machine == EM_SPARCV9) {
                         /* Ignore register directives. */
-                        if (ELF_ST_TYPE(sym->st_info) == STT_REGISTER)
+                        if (ELF_ST_TYPE(sym->st_info) == STT_SPARC_REGISTER)
                                 break;
                 }
 #endif