Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[deliverable/linux.git] / arch / unicore32 / Kconfig

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index eeb8054c7cd84347d242bba052c44cd64a5da5af..03c9ff808b5ab560ef8939e88f1299ba3ba694cd 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -8,6 +8,7 @@ config UNICORE32
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_LZMA
+       select ARCH_HAVE_CUSTOM_GPIO_H
        select GENERIC_FIND_FIRST_BIT
        select GENERIC_IRQ_PROBE
        select GENERIC_IRQ_SHOW
@@ -25,9 +26,6 @@ config HAVE_PWM
 config GENERIC_GPIO
        def_bool y
 
-config GENERIC_CLOCKEVENTS
-       bool
-
 config GENERIC_CSUM
        def_bool y
 
@@ -146,8 +144,6 @@ endmenu
 
 menu "Kernel Features"
 
-source "kernel/time/Kconfig"
-
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"