diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 07:45:56 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-04 07:45:56 (GMT) |
commit | 921a220857cdd3c553cde7c114f9f6757ac80cd5 (patch) | |
tree | 526610397dfb83d72c43c94300deea23d26e782a /arch/arm/configs/trizeps4_defconfig | |
parent | 17eb9d62828c3688f41f31ac00d7fee6da9675bf (diff) | |
parent | 2f48912d1443a796f10c42c89cb386f0e3eca04d (diff) | |
download | linux-921a220857cdd3c553cde7c114f9f6757ac80cd5.tar.xz |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/configs/trizeps4_defconfig')
-rw-r--r-- | arch/arm/configs/trizeps4_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index b6f8381..1e8f5a2 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig @@ -156,7 +156,6 @@ CONFIG_PXA27x=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_XSCALE=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y |