Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[net-next-2.6.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index c91934186896d5da0ca9b2a86216aa58ada6e2f5..b2b90ee394472f56c9386ee0b5a81271573918ec 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -99,9 +99,6 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_IOMAP
        bool
 
-config GENERIC_TIME
-       def_bool y
-
 config GENERIC_CLOCKEVENTS
        def_bool y