diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /arch/arm/configs/mx27_defconfig | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
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 |