---
 include/asm-m68k/io.h |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
@@ -93,7 +93,12 @@ extern unsigned long gg2_isa_base;
 #define ENEC_ISA_MEM_B(madr)	(enec_isa_read_base+((((unsigned long)(madr))&0x1F)<<9))
 #define ENEC_ISA_MEM_W(madr)	(enec_isa_read_base+((((unsigned long)(madr))&0x1F)<<9))
 
+#ifndef MULTI_ISA
 #define MULTI_ISA 0
+#else
+#undef MULTI_ISA
+#define MULTI_ISA 1
+#endif
 #endif /* ATARI */
 
 
@@ -183,7 +188,7 @@ static inline u32 __iomem *isa_itl(unsig
 #ifdef CONFIG_AMIGA_PCMCIA
     case AG_ISA: return (u32 __iomem *)AG_ISA_IO_W(addr);
 #endif
-    default: return 0; /* avoid warnings, just in case */
+    default: return NULL; /* avoid warnings, just in case */
     }
 }
 static inline u8 __iomem *isa_mtb(unsigned long addr)