patch-2.2.8 linux/include/asm-arm/ioc.h

Next file: linux/include/asm-arm/iomd.h
Previous file: linux/include/asm-arm/io.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.7/linux/include/asm-arm/ioc.h linux/include/asm-arm/ioc.h
@@ -3,6 +3,8 @@
  * read/write.
  */
 
+#ifndef IOC_CONTROL
+
 #ifndef __ASSEMBLER__
 #define __IOC(offset)	(IOC_BASE + (offset >> 2))
 #else
@@ -54,3 +56,4 @@
 #define IOC_T3GO	__IOC(0x78)
 #define IOC_T3LATCH	__IOC(0x7c)
 
+#endif

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