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 cabf0bfffc534a06b1e9850d8d814cd98fa988a4..1734d96422c60f82219e779d57bae3c81fac525b 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -17,6 +17,10 @@ config SWAP
        bool
        default n
 
+config ZONE_DMA
+       bool
+       default y
+
 config FPU
        bool
        default n
@@ -29,6 +33,14 @@ 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
@@ -45,6 +57,9 @@ config TIME_LOW_RES
        bool
        default y
 
+config NO_IOPORT
+       def_bool y
+
 config ISA
        bool
        default y