[tip:timers/core] alpha: Use generic time config

tip-bot for Anna-Maria Gleixner
2012-05-21T09:08:50Z

Commit-ID: 6e24f31eab6af44043e9d432bde415c1b4ca1a9e
Gitweb: http://git.kernel.org/tip/6e24f31eab6af44043e9d432bde415c1b4ca1a9e
Author: Anna-Maria Gleixner <anna-maria@glx-um.de>
AuthorDate: Fri, 18 May 2012 16:45:56 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 21 May 2012 11:01:41 +0200

alpha: Use generic time config

Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Acked-by: Matt Turner <mattst88@gmail.com>
Link: http://lkml.kernel.org/r/20120518163107.510619939@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/alpha/Kconfig | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 22e58a9..77ba268 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -15,6 +15,7 @@ config ALPHA
select GENERIC_IRQ_SHOW
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARCH_HAVE_NMI_SAFE_CMPXCHG
+ select GENERIC_CMOS_UPDATE
help
The Alpha is a 64-bit general-purpose processor designed and
marketed by the Digital Equipment Corporation of blessed memory,
@@ -47,9 +48,6 @@ config GENERIC_CALIBRATE_DELAY
bool
default y

-config GENERIC_CMOS_UPDATE
- def_bool y
-
config GENERIC_GPIO
bool