Skip to content

Commit 77a8782

Browse files
sfrothwelltorvalds
authored andcommitted
clocksource/drivers/clps_711x: fixup for "ARM: clps711x:
Switch to MULTIPLATFORM" Missed conflict between commit c86f517 ("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: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent e48af7a commit 77a8782

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/mach-clps711x/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X
33
depends on ARCH_MULTI_V4T
44
select ARCH_REQUIRE_GPIOLIB
55
select AUTO_ZRELADDR
6-
select CLKSRC_MMIO
76
select CLKSRC_OF
7+
select CLPS711X_TIMER
88
select COMMON_CLK
99
select CPU_ARM720T
1010
select GENERIC_CLOCKEVENTS

0 commit comments

Comments
 (0)