diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-05 09:22:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-05 09:22:26 +0100 |
| commit | 0c15702445eef6ff9dba774fd1995aca10176969 (patch) | |
| tree | 33e865edad4ed4cc1cbb9667717a7261123b5f2a /arch/arm/configs/mx3_defconfig | |
| parent | 64724ef8bd2a25aa91678c253a5dbfdad1a95662 (diff) | |
| parent | 25971dfe3a9d14c3b91fc51de96d7f48da394c99 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/configs/mx3_defconfig')
| -rw-r--r-- | arch/arm/configs/mx3_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig index 72a8201a537..20ada526f6d 100644 --- a/arch/arm/configs/mx3_defconfig +++ b/arch/arm/configs/mx3_defconfig @@ -197,7 +197,7 @@ CONFIG_MXC_PWM=y # CONFIG_CPU_32=y CONFIG_CPU_V6=y -CONFIG_CPU_32v6K=y +# CONFIG_CPU_32v6K is not set CONFIG_CPU_32v6=y CONFIG_CPU_ABRT_EV6=y CONFIG_CPU_PABRT_NOIFAR=y |