Merge git://oss.sgi.com:8090/xfs/xfs-2.6

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

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 70a577c89c7c84d279d9ce9f9c08f1c0bbaa08db..a8e1e604dfa81427b19d77a1ae3d81fdfb9841c8 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -42,6 +42,9 @@ config ARCH_MAY_HAVE_PC_FDC
        depends on Q40 || (BROKEN && SUN3X)
        default y
 
+config NO_IOPORT
+       def_bool y
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
@@ -439,6 +442,10 @@ config GENERIC_ISA_DMA
        depends on Q40 || AMIGA_PCMCIA || GG2
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 source "drivers/pci/Kconfig"
 
 source "drivers/zorro/Kconfig"