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/integrator_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/integrator_defconfig')
| -rw-r--r-- | arch/arm/configs/integrator_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index 3ce96e60b409..6b0d04395639 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig | |||
| @@ -92,7 +92,6 @@ CONFIG_ARCH_INTEGRATOR_AP=y | |||
| 92 | # | 92 | # |
| 93 | # Processor Type | 93 | # Processor Type |
| 94 | # | 94 | # |
| 95 | CONFIG_CPU_32=y | ||
| 96 | CONFIG_CPU_ARM720T=y | 95 | CONFIG_CPU_ARM720T=y |
| 97 | CONFIG_CPU_ARM920T=y | 96 | CONFIG_CPU_ARM920T=y |
| 98 | # CONFIG_CPU_ARM922T is not set | 97 | # CONFIG_CPU_ARM922T is not set |