diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 3 | ||||
-rw-r--r-- | arch/arm/plat-versatile/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/plat-versatile/Makefile | 10 |
3 files changed, 11 insertions, 10 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 |
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig index 22540f588fd3..c5e2cd014c61 100644 --- a/arch/arm/plat-versatile/Kconfig +++ b/arch/arm/plat-versatile/Kconfig | |||
@@ -3,4 +3,12 @@ if PLAT_VERSATILE | |||
3 | config PLAT_VERSATILE_CLCD | 3 | config PLAT_VERSATILE_CLCD |
4 | bool | 4 | bool |
5 | 5 | ||
6 | config PLAT_VERSATILE_LEDS | ||
7 | def_bool y if LEDS_CLASS | ||
8 | depends on ARCH_REALVIEW || ARCH_VERSATILE | ||
9 | |||
10 | config PLAT_VERSATILE_SCHED_CLOCK | ||
11 | def_bool y if !ARCH_INTEGRATOR | ||
12 | select HAVE_SCHED_CLOCK | ||
13 | |||
6 | endif | 14 | endif |
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 8b3341c11ee5..de6f42f003b3 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile | |||
@@ -1,9 +1,5 @@ | |||
1 | obj-y := clock.o | 1 | obj-y := clock.o |
2 | ifneq ($(CONFIG_ARCH_INTEGRATOR),y) | ||
3 | obj-y += sched-clock.o | ||
4 | endif | ||
5 | ifeq ($(CONFIG_LEDS_CLASS),y) | ||
6 | obj-$(CONFIG_ARCH_REALVIEW) += leds.o | ||
7 | obj-$(CONFIG_ARCH_VERSATILE) += leds.o | ||
8 | endif | ||
9 | obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o | 2 | obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o |
3 | obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o | ||
4 | obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o | ||
5 | |||