diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-13 03:58:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-13 04:08:50 -0500 |
| commit | 61405fea92c42d072d9b8bd189689f1502a838af (patch) | |
| tree | 013ea3e7ed71f4114004d5852d40b6e89e128f76 /arch/arm/configs/omap3_defconfig | |
| parent | 9c443dfdd31eddea6cbe6ee0ca469fbcc4e1dc3b (diff) | |
| parent | 1703f2c321a8a531c393e137a82602e16c6061cb (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: queue up dependent patch, update to -rc4
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/configs/omap3_defconfig')
| -rw-r--r-- | arch/arm/configs/omap3_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap3_defconfig index 2af28eab9060..367be98a6aef 100644 --- a/arch/arm/configs/omap3_defconfig +++ b/arch/arm/configs/omap3_defconfig | |||
| @@ -245,7 +245,6 @@ CONFIG_MACH_OMAP_3630SDP=y | |||
| 245 | # | 245 | # |
| 246 | # Processor Type | 246 | # Processor Type |
| 247 | # | 247 | # |
| 248 | CONFIG_CPU_32=y | ||
| 249 | CONFIG_CPU_32v6K=y | 248 | CONFIG_CPU_32v6K=y |
| 250 | CONFIG_CPU_V7=y | 249 | CONFIG_CPU_V7=y |
| 251 | CONFIG_CPU_32v7=y | 250 | CONFIG_CPU_32v7=y |