---

yaml --- r: 61918 b: refs/heads/master c: dfedfaf h: refs/heads/master v: v3
git-mirror · Jul 20, 2007 · a16b79a · a16b79a
1 parent e25fc97
commit a16b79a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 446df4c1e5f56cb68ec0cd9c29bbb2c7b04a513e
+refs/heads/master: dfedfaf55a452637d72bfc482c80f902a470ebb7
diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
@@ -49,6 +49,9 @@ config ARCH_MAY_HAVE_PC_FDC
 config NO_IOPORT
 	def_bool y
 
+config NO_DMA
+	def_bool SUN3
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"

diff --git a/trunk/drivers/parport/Kconfig b/trunk/drivers/parport/Kconfig
@@ -35,7 +35,7 @@ if PARPORT
 
 config PARPORT_PC
 	tristate "PC-style hardware"
-	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV
+	depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && (!M68K || ISA)
 	---help---
 	  You should say Y here if you have a PC-style parallel port. All
 	  IBM PC compatible computers and some Alphas have PC-style