diff options
| author | Stephen Rothwell | 2016-07-07 05:59:06 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-08-02 03:25:20 +0200 |
| commit | 77a87824ed676ca8ff8482e4157d3adb284fd381 (patch) | |
| tree | eca062e0d63648cfce1be4b6ae0257f3248bb28f /arch/arm/mach-clps711x | |
| parent | Merge tag 'please-pull-misc-4.8' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | kernel-qcow2-linux-77a87824ed676ca8ff8482e4157d3adb284fd381.tar.gz kernel-qcow2-linux-77a87824ed676ca8ff8482e4157d3adb284fd381.tar.xz kernel-qcow2-linux-77a87824ed676ca8ff8482e4157d3adb284fd381.zip | |
clocksource/drivers/clps_711x: fixup for "ARM: clps711x:
Switch to MULTIPLATFORM"
Missed conflict between commit c86f51737f8d ("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 <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-clps711x')
| -rw-r--r-- | arch/arm/mach-clps711x/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index 3b56197ccfd0..dc7c6edeab39 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig @@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X depends on ARCH_MULTI_V4T select ARCH_REQUIRE_GPIOLIB select AUTO_ZRELADDR - select CLKSRC_MMIO select CLKSRC_OF + select CLPS711X_TIMER select COMMON_CLK select CPU_ARM720T select GENERIC_CLOCKEVENTS |