From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 23 Jul 2022 15:06:06 +0000 (+0200)
Subject: Revert "m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch"
X-Git-Tag: v5.10.134~88
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b07240ce4a09d9771d544e15a3a4ec008cc186ad;p=users%2Fdwmw2%2Flinux.git

Revert "m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch"

This reverts commit 87ae522e467e17a13b796e2cb595f9c3943e4d5e which is
commit db87db65c1059f3be04506d122f8ec9b2fa3b05e upstream.

It is not needed in 5.10.y and causes problems.

Link: https://lore.kernel.org/r/CAK8P3a0vZrXxNp3YhrxFjFunHgxSZBKD9Y4darSODgeFAukCeQ@mail.gmail.com
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
index d1e93a39cd3bc..f1be832e2b746 100644
--- a/arch/m68k/Kconfig.bus
+++ b/arch/m68k/Kconfig.bus
@@ -63,7 +63,7 @@ source "drivers/zorro/Kconfig"
 
 endif
 
-if COLDFIRE
+if !MMU
 
 config ISA_DMA_API
 	def_bool !M5272