Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / h8300 / Kconfig

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 26698a49f1535883d01a4a6031db7d08aeda284c..cabf0bfffc534a06b1e9850d8d814cd98fa988a4 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -21,10 +21,6 @@ config FPU
        bool
        default n
 
-config UID16
-       bool
-       default y
-
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
@@ -33,10 +29,22 @@ 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
 
+config TIME_LOW_RES
+       bool
+       default y
+
 config ISA
        bool
        default y