Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[sfrench/cifs-2.6.git] / arch / microblaze / Kconfig

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 333b85e80c0711636e4fc37697f81efb8ae3fcfd..0bf44231aaf91c023e2f2ac1dfa03c0a34da3a24 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -22,6 +22,7 @@ config MICROBLAZE
        select GENERIC_PCI_IOMAP
        select GENERIC_CPU_DEVICES
        select GENERIC_ATOMIC64
        select GENERIC_PCI_IOMAP
        select GENERIC_CPU_DEVICES
        select GENERIC_ATOMIC64

+       select GENERIC_CLOCKEVENTS

 
 config SWAP
        def_bool n
 
 config SWAP
        def_bool n


@@ -50,12 +51,6 @@ config GENERIC_HWEIGHT
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 
 config GENERIC_CALIBRATE_DELAY
        def_bool y
 

-config GENERIC_TIME_VSYSCALL
-       def_bool n
-
-config GENERIC_CLOCKEVENTS
-       def_bool y
-

 config GENERIC_GPIO
        bool
 
 config GENERIC_GPIO
        bool
 


@@ -79,8 +74,6 @@ source "arch/microblaze/platform/Kconfig.platform"
 
 menu "Processor type and features"
 
 
 menu "Processor type and features"
 

-source "kernel/time/Kconfig"
-

 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"
 source "kernel/Kconfig.preempt"
 
 source "kernel/Kconfig.hz"