git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-arm
/
hardware
/
sa1111.h
diff --git
a/include/asm-arm/hardware/sa1111.h
b/include/asm-arm/hardware/sa1111.h
index
690e7f4
..
8fd4f52
100644
(file)
--- a/
include/asm-arm/hardware/sa1111.h
+++ b/
include/asm-arm/hardware/sa1111.h
@@
-49,8
+49,8
@@
*/
#define __CCREG(x) __REGP(SA1111_VBASE + (x))
*/
#define __CCREG(x) __REGP(SA1111_VBASE + (x))
-#define sa1111_writel(val,addr)
({ *(volatile unsigned int *)(addr) = (val); }
)
-#define sa1111_readl(addr)
(*(volatile unsigned int *)(addr)
)
+#define sa1111_writel(val,addr)
__raw_writel(val, addr
)
+#define sa1111_readl(addr)
__raw_readl(addr
)
/*
* System Bus Interface (SBI)
/*
* System Bus Interface (SBI)
@@
-551,7
+551,7
@@
struct sa1111_dev {
struct device dev;
unsigned int devid;
struct resource res;
struct device dev;
unsigned int devid;
struct resource res;
- void
*mapbase;
+ void
__iomem
*mapbase;
unsigned int skpcr_mask;
unsigned int irq[6];
u64 dma_mask;
unsigned int skpcr_mask;
unsigned int irq[6];
u64 dma_mask;