aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-18 15:26:08 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-19 06:11:28 -0500
commitdc37c31bbfaf87118d6c827be0a38a512a40b741 (patch)
tree188741bec32c43d8a92c32e44420b5404744d261 /arch/arm/Kconfig
parentf093728c0ddc30bef5792b7faf2743024b166350 (diff)
ARM: rationalize versatile family Kconfig/Makefile
Move leds and sched_clock build conditionals out of the Makefile into the Kconfig file. Move selection of HAVE_SCHED_CLOCK into the platform Kconfig rather than duplicating it three times in the main architecture Kconfig. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4f0e83e07989..fe8d6fa12fe7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -236,7 +236,6 @@ config ARCH_REALVIEW
236 bool "ARM Ltd. RealView family" 236 bool "ARM Ltd. RealView family"
237 select ARM_AMBA 237 select ARM_AMBA
238 select CLKDEV_LOOKUP 238 select CLKDEV_LOOKUP
239 select HAVE_SCHED_CLOCK
240 select ICST 239 select ICST
241 select GENERIC_CLOCKEVENTS 240 select GENERIC_CLOCKEVENTS
242 select ARCH_WANT_OPTIONAL_GPIOLIB 241 select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -252,7 +251,6 @@ config ARCH_VERSATILE
252 select ARM_AMBA 251 select ARM_AMBA
253 select ARM_VIC 252 select ARM_VIC
254 select CLKDEV_LOOKUP 253 select CLKDEV_LOOKUP
255 select HAVE_SCHED_CLOCK
256 select ICST 254 select ICST
257 select GENERIC_CLOCKEVENTS 255 select GENERIC_CLOCKEVENTS
258 select ARCH_WANT_OPTIONAL_GPIOLIB 256 select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -270,7 +268,6 @@ config ARCH_VEXPRESS
270 select CLKDEV_LOOKUP 268 select CLKDEV_LOOKUP
271 select GENERIC_CLOCKEVENTS 269 select GENERIC_CLOCKEVENTS
272 select HAVE_CLK 270 select HAVE_CLK
273 select HAVE_SCHED_CLOCK
274 select HAVE_PATA_PLATFORM 271 select HAVE_PATA_PLATFORM
275 select ICST 272 select ICST
276 select PLAT_VERSATILE 273 select PLAT_VERSATILE