From: Olof Johansson Date: Sat, 5 Jan 2013 16:33:30 +0000 (-0800) Subject: ARM: clps711x: Fix bad merge of clockevents setup X-Git-Tag: v3.8-rc3~5^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e3a4a2eb67acdd710a833b767c20e9189cc3458;p=platform%2Fkernel%2Flinux-exynos.git ARM: clps711x: Fix bad merge of clockevents setup I mismerged a previous branch from Alexander, and accidentally left in ARCH_USES_GETTIMEOFFSET. Remove it. Signed-off-by: Olof Johansson Cc: Alexander Shiyan --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f95ba14..ab864d9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -371,7 +371,6 @@ config ARCH_CNS3XXX config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select ARCH_REQUIRE_GPIOLIB - select ARCH_USES_GETTIMEOFFSET select AUTO_ZRELADDR select CLKDEV_LOOKUP select COMMON_CLK