From a1a3c4e2ec87170066c2e68b76c5687959ad90a0 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:51 +0000 Subject: [PATCH] --- yaml --- r: 307606 b: refs/heads/master c: b9ed27dfcd8b68de90dc285acd9e7c7113964888 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4eb5c1327f98..2d1bba02be4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea5332098e68e2380429ce8025996fad61ca28a6 +refs/heads/master: b9ed27dfcd8b68de90dc285acd9e7c7113964888 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index feab3bad6d0f..901215f7a2f2 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -27,15 +27,6 @@ config MMU bool default y -config GENERIC_CMOS_UPDATE - def_bool y - -config GENERIC_TIME_VSYSCALL - def_bool y - -config GENERIC_CLOCKEVENTS - def_bool y - config HAVE_SETUP_PER_CPU_AREA def_bool PPC64 @@ -144,6 +135,9 @@ config PPC select HAVE_BPF_JIT if (PPC64 && NET) select HAVE_ARCH_JUMP_LABEL select ARCH_HAVE_NMI_SAFE_CMPXCHG + select GENERIC_CMOS_UPDATE + select GENERIC_TIME_VSYSCALL + select GENERIC_CLOCKEVENTS config EARLY_PRINTK bool