Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[~andy/linux] / arch / um / Kconfig.common

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 0d207e73a75821df92dfc443c546530650a43e96..7c8e277f6d342a295d37bad076a6fb61588dbae6 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -55,10 +55,6 @@ config GENERIC_BUG
        default y
        depends on BUG
 
-config GENERIC_TIME
-       bool
-       default y
-
 config GENERIC_CLOCKEVENTS
        bool
        default y