summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/Kconfig
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-06-15 23:06:48 +0200
committerTony Luck <tony.luck@intel.com>2005-06-15 23:06:48 +0200
commitf2cbb4f01936a3e4225692e03b084b78c56d386d (patch)
treef89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/m68knommu/Kconfig
parentMerge with temp tree to get David's gdb inferior calls patch (diff)
parent[PATCH] update ppc64 defconfig (diff)
downloadlinux-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.xz
linux-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/m68knommu/Kconfig')
-rw-r--r--arch/m68knommu/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index fc4615b6d3a9..e729bd280623 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -534,6 +534,11 @@ endchoice
endmenu
+config ISA_DMA_API
+ bool
+ depends on !M5272
+ default y
+
menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
config PCI