From e9d96eb362cd8b64594cfdb9ea704e1cab18287e Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Mon, 18 Dec 2006 00:59:10 +0100
Subject: [PATCH] --- yaml --- r: 44696 b: refs/heads/master c:
 99e4a6dda9dc4b863773c0a5857b762474b817cf h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/kernel/setup.c     | 1 +
 trunk/arch/arm/mach-ep93xx/core.c | 4 ++++
 trunk/include/asm-arm/elf.h       | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bba314a83c2a..9dbfd71ac829 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bcb533c1338813085b0a35a6dd0887eb5a5af67
+refs/heads/master: 99e4a6dda9dc4b863773c0a5857b762474b817cf
diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c
index cf2bd4242803..bbab134cd82d 100644
--- a/trunk/arch/arm/kernel/setup.c
+++ b/trunk/arch/arm/kernel/setup.c
@@ -855,6 +855,7 @@ static const char *hwcap_str[] = {
 	"edsp",
 	"java",
 	"iwmmxt",
+	"crunch",
 	NULL
 };
 
diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c
index d649b39711d4..6b26346191c0 100644
--- a/trunk/arch/arm/mach-ep93xx/core.c
+++ b/trunk/arch/arm/mach-ep93xx/core.c
@@ -477,4 +477,8 @@ void __init ep93xx_init_devices(void)
 
 	platform_device_register(&ep93xx_rtc_device);
 	platform_device_register(&ep93xx_ohci_device);
+
+#ifdef CONFIG_CRUNCH
+	elf_hwcap |= HWCAP_CRUNCH;
+#endif
 }
diff --git a/trunk/include/asm-arm/elf.h b/trunk/include/asm-arm/elf.h
index 642382d2c9f0..3679a8a8922e 100644
--- a/trunk/include/asm-arm/elf.h
+++ b/trunk/include/asm-arm/elf.h
@@ -52,6 +52,7 @@ typedef struct user_fp elf_fpregset_t;
 #define HWCAP_EDSP	128
 #define HWCAP_JAVA	256
 #define HWCAP_IWMMXT	512
+#define HWCAP_CRUNCH	1024
 
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__