diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:51:35 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:51:35 -0500 |
| commit | e9d728f528f9548c8dd013899b23e662fa7b6bca (patch) | |
| tree | d88a5df6e5a2b33ebe088ad0223fe54679a59df3 /arch/arm/Kconfig | |
| parent | 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1 (diff) | |
| parent | 6155f77d09b968f591876f368d4843168910449e (diff) | |
Merge branch 'rmobile/smp' into rmobile-latest
Conflicts:
arch/arm/Kconfig
arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7daab42eb54f..e2f801167593 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1258,7 +1258,7 @@ config SMP | |||
| 1258 | depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \ | 1258 | depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \ |
| 1259 | MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ | 1259 | MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ |
| 1260 | ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ | 1260 | ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ |
| 1261 | ARCH_MSM_SCORPIONMP | 1261 | ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE |
| 1262 | select USE_GENERIC_SMP_HELPERS | 1262 | select USE_GENERIC_SMP_HELPERS |
| 1263 | select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP | 1263 | select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP |
| 1264 | help | 1264 | help |