Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8b1b9fc authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

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: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarOleksij Rempel <linux@rempel-privat.de>

Conflicts:
	drivers/clocksource/Kconfig
parent c517d838

arch/arm/mach-asm9260/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2,5 +2,7 @@ config MACH_ASM9260 
	bool "Alphascale ASM9260"

	depends on ARCH_MULTI_V5

	select CPU_ARM926T

	select ASM9260_TIMER

	select GENERIC_CLOCKEVENTS

	help

	  Support for Alphascale ASM9260 based platform.

drivers/clocksource/Kconfig

+5 −11
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ config VT8500_TIMER 
config CADENCE_TTC_TIMER

	bool



config ASM9260_TIMER

	bool

	select CLKSRC_MMIO

	select CLKSRC_OF



config CLKSRC_NOMADIK_MTU

	bool

	depends on (ARCH_NOMADIK || ARCH_U8500)
@@ -245,15 +250,4 @@ config CLKSRC_PXA 
	help

	  This enables OST0 support available on PXA and SA-11x0

	  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