summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-sa1100
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /include/asm-arm/arch-sa1100
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'include/asm-arm/arch-sa1100')
-rw-r--r--include/asm-arm/arch-sa1100/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-sa1100/io.h b/include/asm-arm/arch-sa1100/io.h
index 3e0001a1a..d1d8aa11a 100644
--- a/include/asm-arm/arch-sa1100/io.h
+++ b/include/asm-arm/arch-sa1100/io.h
@@ -20,7 +20,7 @@
* Generic virtual read/write
*/
#define __arch_getb(a) (*(volatile unsigned char *)(a))
-#define __arch_getl(a) (*(volatile unsigned long *)(a))
+#define __arch_getl(a) (*(volatile unsigned int *)(a))
extern __inline__ unsigned int __arch_getw(unsigned long a)
{
@@ -33,7 +33,7 @@ extern __inline__ unsigned int __arch_getw(unsigned long a)
#define __arch_putb(v,a) (*(volatile unsigned char *)(a) = (v))
-#define __arch_putl(v,a) (*(volatile unsigned long *)(a) = (v))
+#define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v))
extern __inline__ void __arch_putw(unsigned int value, unsigned long a)
{