Merge branches 'fixes' and 'fixes2' into devel-late

[mirror_ubuntu-zesty-kernel.git] / arch / unicore32 / Kconfig

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 7ff6d10c0be2a5413713d205b8862f2cc6786a26..03c9ff808b5ab560ef8939e88f1299ba3ba694cd 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -26,9 +26,6 @@ config HAVE_PWM
 config GENERIC_GPIO
        def_bool y
 
-config GENERIC_CLOCKEVENTS
-       bool
-
 config GENERIC_CSUM
        def_bool y
 
@@ -147,8 +144,6 @@ endmenu
 
 menu "Kernel Features"
 
-source "kernel/time/Kconfig"
-
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"