From 60c85ef14f43fd35176ef58b2585bf241ca17439 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:55 +0000 Subject: [PATCH] --- yaml --- r: 307613 b: refs/heads/master c: 875c9d09b5a6400d6882b0e6e828862a73ce739d h: refs/heads/master i: 307611: 60cf5698d1eedb0b1e92550dc220564ab3dab56f v: v3 --- [refs] | 2 +- trunk/arch/um/Kconfig.common | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a5951d8ce8b..3eb9874bfb27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ec008d630d9d96579b5911c140bb8de2aa68f0e +refs/heads/master: 875c9d09b5a6400d6882b0e6e828862a73ce739d diff --git a/trunk/arch/um/Kconfig.common b/trunk/arch/um/Kconfig.common index 20a49ba93cb9..806185de0ba2 100644 --- a/trunk/arch/um/Kconfig.common +++ b/trunk/arch/um/Kconfig.common @@ -10,6 +10,7 @@ config UML select GENERIC_IRQ_SHOW select GENERIC_CPU_DEVICES select GENERIC_IO + select GENERIC_CLOCKEVENTS config MMU bool @@ -52,10 +53,6 @@ config GENERIC_BUG default y depends on BUG -config GENERIC_CLOCKEVENTS - bool - default y - # Used in kernel/irq/manage.c and include/linux/irq.h config IRQ_RELEASE_METHOD bool