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/simpad_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/simpad_defconfig')
| -rw-r--r-- | arch/arm/configs/simpad_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig index 685d2b513206..ee25e6344151 100644 --- a/arch/arm/configs/simpad_defconfig +++ b/arch/arm/configs/simpad_defconfig | |||
| @@ -101,7 +101,6 @@ CONFIG_SA1100_SIMPAD=y | |||
| 101 | # | 101 | # |
| 102 | # Processor Type | 102 | # Processor Type |
| 103 | # | 103 | # |
| 104 | CONFIG_CPU_32=y | ||
| 105 | CONFIG_CPU_SA1100=y | 104 | CONFIG_CPU_SA1100=y |
| 106 | CONFIG_CPU_32v4=y | 105 | CONFIG_CPU_32v4=y |
| 107 | CONFIG_CPU_ABRT_EV4=y | 106 | CONFIG_CPU_ABRT_EV4=y |