diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:42:48 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:42:48 -0500 |
| commit | f412b09f4ed7c57f5b8935ed7d6fc786f402a629 (patch) | |
| tree | 34fe1b4b64db4993e9fb21a70812fafed0437870 /arch/arm/kernel/setup.c | |
| parent | 31bccbf39208133415000520c79ebe7b291786df (diff) | |
| parent | 7f1fd31db158c95418d9cc5690ab60ecc6fb632d (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 1f1eecca7f55..d4dae3e9b294 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -772,6 +772,8 @@ static const char *hwcap_str[] = { | |||
| 772 | "java", | 772 | "java", |
| 773 | "iwmmxt", | 773 | "iwmmxt", |
| 774 | "crunch", | 774 | "crunch", |
| 775 | "thumbee", | ||
| 776 | "neon", | ||
| 775 | NULL | 777 | NULL |
| 776 | }; | 778 | }; |
| 777 | 779 | ||