patch-2.3.40 linux/include/asm-arm/arch-ebsa285/io.h

Next file: linux/include/asm-arm/arch-ebsa285/irq.h
Previous file: linux/include/asm-arm/arch-ebsa110/system.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.39/linux/include/asm-arm/arch-ebsa285/io.h linux/include/asm-arm/arch-ebsa285/io.h
@@ -16,7 +16,7 @@
  * Translation of various region addresses to virtual addresses
  */
 #define __io_pci(a)		(PCIO_BASE + (a))
-#if 0
+#if 1
 #define __mem_pci(a)		((unsigned long)(a))
 #define __mem_isa(a)		(PCIMEM_BASE + (unsigned long)(a))
 #else
@@ -91,7 +91,7 @@
 #define __arch_ioremap(off,size,nocache)			\
 ({								\
 	unsigned long _off = (off), _size = (size);		\
-	void *_ret = NULL;					\
+	void *_ret = (void *)0;					\
 	if (valid_ioaddr(_off, _size))				\
 		_ret = __ioremap(io_to_phys(_off), _size, 0);	\
 	_ret;							\

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)