提交 a8b1b9fc 编写于 作者: D Daniel Lezcano

clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig

The Kconfig options for the asm9260 timer is wrong as it can be selected by
another platform with allyes config and thus leading to a compilation failure
as some non arch related code is pulled by the compilation.

Fix this by having the platform Kconfig to select the timer as it is done for
the others drivers.
Signed-off-by: NDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: NGuenter Roeck <linux@roeck-us.net>
Acked-by: NOleksij Rempel <linux@rempel-privat.de>

Conflicts:
	drivers/clocksource/Kconfig
上级 c517d838
...@@ -2,5 +2,7 @@ config MACH_ASM9260 ...@@ -2,5 +2,7 @@ config MACH_ASM9260
bool "Alphascale ASM9260" bool "Alphascale ASM9260"
depends on ARCH_MULTI_V5 depends on ARCH_MULTI_V5
select CPU_ARM926T select CPU_ARM926T
select ASM9260_TIMER
select GENERIC_CLOCKEVENTS
help help
Support for Alphascale ASM9260 based platform. Support for Alphascale ASM9260 based platform.
...@@ -63,6 +63,11 @@ config VT8500_TIMER ...@@ -63,6 +63,11 @@ config VT8500_TIMER
config CADENCE_TTC_TIMER config CADENCE_TTC_TIMER
bool bool
config ASM9260_TIMER
bool
select CLKSRC_MMIO
select CLKSRC_OF
config CLKSRC_NOMADIK_MTU config CLKSRC_NOMADIK_MTU
bool bool
depends on (ARCH_NOMADIK || ARCH_U8500) depends on (ARCH_NOMADIK || ARCH_U8500)
...@@ -245,15 +250,4 @@ config CLKSRC_PXA ...@@ -245,15 +250,4 @@ config CLKSRC_PXA
help help
This enables OST0 support available on PXA and SA-11x0 This enables OST0 support available on PXA and SA-11x0
platforms. platforms.
config ASM9260_TIMER
bool "Alphascale ASM9260 timer driver"
depends on GENERIC_CLOCKEVENTS
select CLKSRC_MMIO
select CLKSRC_OF
default y if MACH_ASM9260
help
This enables build of a clocksource and clockevent driver for
the 32-bit System Timer hardware available on a Alphascale ASM9260.
endmenu endmenu
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册