diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-10 16:14:12 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 17:11:10 -0400 |
| commit | ce45947b5687918dc6ce8e31938fbfd4059bf89e (patch) | |
| tree | 5b45468956f3836290d5ad041615c74bd7ca565f /arch/arm/Kconfig | |
| parent | 3af8a8dad07527b25055b8b4c2a2b0d69362e7fb (diff) | |
ARM: 6321/1: fix syntax error in main Kconfig file
This fixes:
scripts/kconfig/mconf arch/arm/Kconfig
arch/arm/Kconfig:1187: invalid option
make[1]: *** [menuconfig] Error 1
make: *** [menuconfig] Error 2
which was introduced by
1cea732 ([ARM] tegra: SMP support)
Cc: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com>
Cc: xsecute@googlemail.com
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Colin Cross <ccross@android.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 e3956042892..05fc7cf6711 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1196,7 +1196,7 @@ config LOCAL_TIMERS | |||
| 1196 | REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ | 1196 | REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \ |
| 1197 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA) | 1197 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA) |
| 1198 | default y | 1198 | default y |
| 1199 | select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\ | 1199 | select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\ |
| 1200 | ARCH_U8500 || ARCH_TEGRA | 1200 | ARCH_U8500 || ARCH_TEGRA |
| 1201 | help | 1201 | help |
| 1202 | Enable support for local timers on SMP platforms, rather then the | 1202 | Enable support for local timers on SMP platforms, rather then the |