From 24a1fb940099922521c8cefe1674b74efb3690fa Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:49 +0000 Subject: [PATCH] --- yaml --- r: 307603 b: refs/heads/master c: d6412e2bdcd8dae1d502b49aff418275742d2887 h: refs/heads/master i: 307601: db80d948de55740b9e64c0ea2a8107ed407d4c23 307599: 79d37629d2ab6e926ba8d7843155a1fd971daa0f v: v3 --- [refs] | 2 +- trunk/arch/microblaze/Kconfig | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6f26039e5b66..efaaa39f35d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60a5e4c3d3df6ec9006576935953dde6cf94f02a +refs/heads/master: d6412e2bdcd8dae1d502b49aff418275742d2887 diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig index ac22dc7f4cab..3e786ac9a655 100644 --- a/trunk/arch/microblaze/Kconfig +++ b/trunk/arch/microblaze/Kconfig @@ -22,6 +22,7 @@ config MICROBLAZE select GENERIC_PCI_IOMAP select GENERIC_CPU_DEVICES select GENERIC_ATOMIC64 + select GENERIC_CLOCKEVENTS config SWAP def_bool n @@ -50,12 +51,6 @@ config GENERIC_HWEIGHT config GENERIC_CALIBRATE_DELAY def_bool y -config GENERIC_TIME_VSYSCALL - def_bool n - -config GENERIC_CLOCKEVENTS - def_bool y - config GENERIC_GPIO def_bool y