diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:15:31 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 16:15:31 +0300 |
commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /arch/arm/configs/cm_t35_defconfig | |
parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
download | linux-52e04ea89da57274f0313d2bd73ba02f686cfdeb.tar.xz |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/arm/configs/cm_t35_defconfig')
-rw-r--r-- | arch/arm/configs/cm_t35_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/cm_t35_defconfig b/arch/arm/configs/cm_t35_defconfig index e42c5c873eb2..893cd267e075 100644 --- a/arch/arm/configs/cm_t35_defconfig +++ b/arch/arm/configs/cm_t35_defconfig @@ -236,7 +236,6 @@ CONFIG_MACH_CM_T35=y # # Processor Type # -CONFIG_CPU_32=y CONFIG_CPU_32v6K=y CONFIG_CPU_V7=y CONFIG_CPU_32v7=y |