From 980bc377f935dd71f05426ca97c7988c0aff64a5 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:56 +0000 Subject: [PATCH] --- yaml --- r: 307593 b: refs/heads/master c: 6e24f31eab6af44043e9d432bde415c1b4ca1a9e h: refs/heads/master i: 307591: 662dd3ecb3efb66dcdc1cf55ccf704887ee4bfb8 v: v3 --- [refs] | 2 +- trunk/arch/alpha/Kconfig | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a7e096258744..86d7c681b593 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5e498ad67863cc877fb05e6a71ce58eda4fb2ca +refs/heads/master: 6e24f31eab6af44043e9d432bde415c1b4ca1a9e diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig index 22e58a99f38b..77ba2680a749 100644 --- a/trunk/arch/alpha/Kconfig +++ b/trunk/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