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

Commit 77a87824 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

clocksource/drivers/clps_711x: fixup for "ARM: clps711x: 



 Switch to MULTIPLATFORM"

Missed conflict between commit c86f5173 ("ARM: clps711x: Switch to
MULTIPLATFORM") from the arm-soc tree and commit 250e46aa3bb3
("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") from the
clockevents tree.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e48af7aa

arch/arm/mach-clps711x/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X 
	depends on ARCH_MULTI_V4T

	depends on ARCH_MULTI_V4T

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select AUTO_ZRELADDR

	select AUTO_ZRELADDR

	select CLKSRC_MMIO

	select CLKSRC_OF

	select CLKSRC_OF

	select CLPS711X_TIMER

	select COMMON_CLK

	select COMMON_CLK

	select CPU_ARM720T

	select CPU_ARM720T

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS