Skip to content
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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment