Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...

[sfrench/cifs-2.6.git] / arch / frv / Kconfig

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 4b5830bcbe2e21d25f7eca0f4395a7b54b354d07..16399bd249930c1a9e2e06f7d0da247b288b6d34 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -40,10 +40,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
        bool
        default y
 
-config GENERIC_TIME
-       bool
-       default y
-
 config TIME_LOW_RES
        bool
        default y