Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / arch / h8300 / Kconfig

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 26698a49f1535883d01a4a6031db7d08aeda284c..1734d96422c60f82219e779d57bae3c81fac525b 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -17,13 +17,13 @@ config SWAP
        bool
        default n
 
-config FPU
+config ZONE_DMA
        bool
-       default n
+       default y
 
-config UID16
+config FPU
        bool
-       default y
+       default n
 
 config RWSEM_GENERIC_SPINLOCK
        bool
@@ -33,10 +33,33 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default n
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       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 NO_IOPORT
+       def_bool y
+
 config ISA
        bool
        default y