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/mx27_defconfig | |
parent | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (diff) | |
parent | 2f48912d1443a796f10c42c89cb386f0e3eca04d (diff) |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/configs/mx27_defconfig')
-rw-r--r-- | arch/arm/configs/mx27_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/mx27_defconfig b/arch/arm/configs/mx27_defconfig index 75263a83741c..edfdd6faf800 100644 --- a/arch/arm/configs/mx27_defconfig +++ b/arch/arm/configs/mx27_defconfig | |||
@@ -207,7 +207,6 @@ CONFIG_MXC_PWM=y | |||
207 | # | 207 | # |
208 | # Processor Type | 208 | # Processor Type |
209 | # | 209 | # |
210 | CONFIG_CPU_32=y | ||
211 | CONFIG_CPU_ARM926T=y | 210 | CONFIG_CPU_ARM926T=y |
212 | CONFIG_CPU_32v5=y | 211 | CONFIG_CPU_32v5=y |
213 | CONFIG_CPU_ABRT_EV5TJ=y | 212 | CONFIG_CPU_ABRT_EV5TJ=y |