summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-05 08:33:30 -0800
committerOlof Johansson <olof@lixom.net>2013-01-07 21:08:27 -0800
commit0e3a4a2eb67acdd710a833b767c20e9189cc3458 (patch)
tree450324f5a403cab068d4c254ae727be22d0950a9 /arch
parentdaaeec936fe43f7f3f15e61e1da86f1fa1c37e3e (diff)
downloadlinux-3.10-0e3a4a2eb67acdd710a833b767c20e9189cc3458.tar.gz
linux-3.10-0e3a4a2eb67acdd710a833b767c20e9189cc3458.tar.bz2
linux-3.10-0e3a4a2eb67acdd710a833b767c20e9189cc3458.zip
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 <olof@lixom.net> Cc: Alexander Shiyan <shc_work@mail.ru>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f95ba14ae3d..ab864d9545d 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