patch-2.1.132 linux/include/asm-ppc/amigappc.h

Next file: linux/include/asm-ppc/io.h
Previous file: linux/include/asm-mips/termios.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.131/linux/include/asm-ppc/amigappc.h linux/include/asm-ppc/amigappc.h
@@ -16,20 +16,20 @@
 
 #ifndef __ASSEMBLY__
 
-#ifndef iobarrier /* Don't include io.h - avoid circular dependency */
-#define iobarrier() eieio()
+#ifndef iobarrier_rw /* Don't include io.h - avoid circular dependency */
+#define iobarrier_rw() eieio()
 #endif
 
 #define APUS_WRITE(_a_, _v_)				\
 do {							\
 	(*((volatile unsigned char *)(_a_)) = (_v_));	\
-	iobarrier ();					\
+	iobarrier_rw ();				\
 } while (0)
 
 #define APUS_READ(_a_, _v_) 				\
 do {							\
 	(_v_) = (*((volatile unsigned char *)(_a_)));	\
-	iobarrier ();					\
+	iobarrier_rw ();				\
 } while (0)
 #endif /* ndef __ASSEMBLY__ */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov