projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3af8a8d)
ARM: 6321/1: fix syntax error in main Kconfig file
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tue, 10 Aug 2010 20:14:12 +0000 (21:14 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Aug 2010 21:11:10 +0000 (22:11 +0100)
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>
arch/arm/Kconfig patch | blob | blame | history

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e3956042892c4ac74c608bf891816b5c185e077d..05fc7cf6711dc4d5a989b6080bfb5dbd02014c39 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1196,7 +1196,7 @@ config LOCAL_TIMERS
                REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
                ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
        default y
-       select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\
+       select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\
                ARCH_U8500 || ARCH_TEGRA
        help
          Enable support for local timers on SMP platforms, rather then the