diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 02:45:56 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 02:45:56 -0500 |
| commit | 921a220857cdd3c553cde7c114f9f6757ac80cd5 (patch) | |
| tree | 526610397dfb83d72c43c94300deea23d26e782a /arch/arm/configs/csb337_defconfig | |
| parent | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (diff) | |
| parent | 2f48912d1443a796f10c42c89cb386f0e3eca04d (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/configs/csb337_defconfig')
| -rw-r--r-- | arch/arm/configs/csb337_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig index 29f68c2effe6..f095040dab07 100644 --- a/arch/arm/configs/csb337_defconfig +++ b/arch/arm/configs/csb337_defconfig | |||
| @@ -193,7 +193,6 @@ CONFIG_AT91_TIMER_HZ=128 | |||
| 193 | # | 193 | # |
| 194 | # Processor Type | 194 | # Processor Type |
| 195 | # | 195 | # |
| 196 | CONFIG_CPU_32=y | ||
| 197 | CONFIG_CPU_ARM920T=y | 196 | CONFIG_CPU_ARM920T=y |
| 198 | CONFIG_CPU_32v4T=y | 197 | CONFIG_CPU_32v4T=y |
| 199 | CONFIG_CPU_ABRT_EV4T=y | 198 | CONFIG_CPU_ABRT_EV4T=y |