Commit ce45947b authored Aug 10, 2010 by Uwe Kleine-König Committed by Russell King Aug 10, 2010

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

	1cea7326 ([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>

parent 3af8a8da

arch/arm/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message