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/omap_zoom2_defconfig | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/arm/configs/omap_zoom2_defconfig')
| -rw-r--r-- | arch/arm/configs/omap_zoom2_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/omap_zoom2_defconfig b/arch/arm/configs/omap_zoom2_defconfig index 4b00a4306812..a82e81332a03 100644 --- a/arch/arm/configs/omap_zoom2_defconfig +++ b/arch/arm/configs/omap_zoom2_defconfig | |||
| @@ -222,7 +222,6 @@ CONFIG_MACH_OMAP_ZOOM2=y | |||
| 222 | # | 222 | # |
| 223 | # Processor Type | 223 | # Processor Type |
| 224 | # | 224 | # |
| 225 | CONFIG_CPU_32=y | ||
| 226 | CONFIG_CPU_32v6K=y | 225 | CONFIG_CPU_32v6K=y |
| 227 | CONFIG_CPU_V7=y | 226 | CONFIG_CPU_V7=y |
| 228 | CONFIG_CPU_32v7=y | 227 | CONFIG_CPU_32v7=y |