diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-05 17:33:30 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 06:08:27 +0100 |
| commit | 0e3a4a2eb67acdd710a833b767c20e9189cc3458 (patch) | |
| tree | 450324f5a403cab068d4c254ae727be22d0950a9 | |
| parent | Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-0e3a4a2eb67acdd710a833b767c20e9189cc3458.tar.xz linux-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>
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f95ba14ae3d0..ab864d9545dd 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 |