patch-2.4.15 linux/include/asm-arm/arch-sa1100/hardware.h

Next file: linux/include/asm-arm/pci.h
Previous file: linux/include/asm-arm/arch-integrator/sizes.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.14/linux/include/asm-arm/arch-sa1100/hardware.h linux/include/asm-arm/arch-sa1100/hardware.h
@@ -62,7 +62,7 @@
 #ifndef __ASSEMBLY__
 
 #if 0
-# define __REG(x)	(*((volatile unsigned long *)io_p2v(x)))
+# define __REG(x)	(*((volatile u32 *)io_p2v(x)))
 #else
 /*
  * This __REG() version gives the same results as the one above,  except
@@ -70,12 +70,12 @@
  * assembly code for access to contigous registers.  It's a shame that gcc
  * doesn't guess this by itself.
  */
-typedef struct { volatile unsigned long offset[4096]; } __regbase;
+typedef struct { volatile u32 offset[4096]; } __regbase;
 # define __REGP(x)	((__regbase *)((x)&~4095))->offset[((x)&4095)>>2]
 # define __REG(x)	__REGP(io_p2v(x))
 #endif
 
-# define __PREG(x)	(io_v2p((unsigned long)&(x)))
+# define __PREG(x)	(io_v2p((u32)&(x)))
 
 #else
 

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