Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 6bbd93dd186a..29efc9f82057 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -357,6 +357,9 @@ static void __init setup_processor(void)
 #ifndef CONFIG_VFP
         elf_hwcap &= ~HWCAP_VFP;
 #endif
+#ifndef CONFIG_IWMMXT
+        elf_hwcap &= ~HWCAP_IWMMXT;
+#endif
 
         cpu_proc_init();
 }
@@ -854,6 +857,7 @@ static const char *hwcap_str[] = {
         "vfp",
         "edsp",
         "java",
+        "iwmmxt",
         NULL
 };