Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

[linux-2.6] / arch / v850 / Kconfig

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 310865903234750fc4599d7782f5ac0b3e6000a2..bcf825875d1706f4c108d4d75a5f24bbd814ba6b 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -10,15 +10,18 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
                bool
        default n
-config UID16
-       bool
-       default n
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 config RWSEM_XCHGADD_ALGORITHM
        bool
        default n
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+config GENERIC_HWEIGHT
+       bool
+       default y
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -31,6 +34,18 @@ config GENERIC_IRQ_PROBE
        bool
        default y
 
+config TIME_LOW_RES
+       bool
+       default y
+
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 # Turn off some random 386 crap that can affect device config
 config ISA
        bool