* [PATCH] ARM: clps711x: Fix bad merge of clockevents setup
@ 2013-01-05 16:37 Olof Johansson
0 siblings, 0 replies; only message in thread
From: Olof Johansson @ 2013-01-05 16:37 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
I have applied this to the fixes branch and will include in the next
upstream pull request.
arch/arm/Kconfig | 1 -
1 file changed, 1 deletion(-)
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
--
1.7.10.1.488.g05fbf7a
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-05 16:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-05 16:37 [PATCH] ARM: clps711x: Fix bad merge of clockevents setup Olof Johansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.