Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

[mv-sheeva.git] / arch / um / defconfig

diff --git a/arch/um/defconfig b/arch/um/defconfig
index 9f7634f08cf3da9c76419ec9e9296a04e0cfcd7d..761f5e1a657ee2d47117b7e15020ed10379e3037 100644 (file)
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -13,7 +13,6 @@ CONFIG_LOCKDEP_SUPPORT=y
 # CONFIG_STACKTRACE_SUPPORT is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_IRQ_RELEASE_METHOD=y
 CONFIG_HZ=100