diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-01-22 02:55:25 -0500 |
| commit | 7755726fe90a8b253659756e6de68c1a55aa427f (patch) | |
| tree | a3523fa77e07854db3b8089e3066a55ea997060c /arch/arm/configs/tct_hammer_defconfig | |
| parent | 3bf127637e22ddf95e67e10a23c339cee3d52429 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'arch/arm/configs/tct_hammer_defconfig')
| -rw-r--r-- | arch/arm/configs/tct_hammer_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/tct_hammer_defconfig b/arch/arm/configs/tct_hammer_defconfig index 9d32faef05f6..dccf14b4ee02 100644 --- a/arch/arm/configs/tct_hammer_defconfig +++ b/arch/arm/configs/tct_hammer_defconfig | |||
| @@ -215,7 +215,6 @@ CONFIG_MACH_TCT_HAMMER=y | |||
| 215 | # | 215 | # |
| 216 | # Processor Type | 216 | # Processor Type |
| 217 | # | 217 | # |
| 218 | CONFIG_CPU_32=y | ||
| 219 | CONFIG_CPU_ARM920T=y | 218 | CONFIG_CPU_ARM920T=y |
| 220 | CONFIG_CPU_32v4T=y | 219 | CONFIG_CPU_32v4T=y |
| 221 | CONFIG_CPU_ABRT_EV4T=y | 220 | CONFIG_CPU_ABRT_EV4T=y |