diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-05 11:33:30 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 00:08:27 -0500 |
| commit | 0e3a4a2eb67acdd710a833b767c20e9189cc3458 (patch) | |
| tree | 450324f5a403cab068d4c254ae727be22d0950a9 | |
| parent | daaeec936fe43f7f3f15e61e1da86f1fa1c37e3e (diff) | |
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 | |||
| 371 | config ARCH_CLPS711X | 371 | config ARCH_CLPS711X |
| 372 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" | 372 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" |
| 373 | select ARCH_REQUIRE_GPIOLIB | 373 | select ARCH_REQUIRE_GPIOLIB |
| 374 | select ARCH_USES_GETTIMEOFFSET | ||
| 375 | select AUTO_ZRELADDR | 374 | select AUTO_ZRELADDR |
| 376 | select CLKDEV_LOOKUP | 375 | select CLKDEV_LOOKUP |
| 377 | select COMMON_CLK | 376 | select COMMON_CLK |