summaryrefslogtreecommitdiffstats
path: root/drivers/serial/mpsc.h
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-25 18:32:12 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-25 18:32:12 -0700
commit2c6e75999000ebc942526466dbd0de37bfac73a4 (patch)
tree5a3c9d98da4f744fa1cedc32cb74c6dc124adc57 /drivers/serial/mpsc.h
parentab2fd30b668b1687a9ca9e9ea0b60145deeafe84 (diff)
[PATCH] ppc annotations: mpsc
Usual iomem annotations + NULL noise removal. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/serial/mpsc.h')
-rw-r--r--drivers/serial/mpsc.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/mpsc.h b/drivers/serial/mpsc.h
index 1f7294b7095..678dbcf06c8 100644
--- a/drivers/serial/mpsc.h
+++ b/drivers/serial/mpsc.h
@@ -83,8 +83,8 @@ struct mpsc_shared_regs {
phys_addr_t mpsc_routing_base_p;
phys_addr_t sdma_intr_base_p;
- void *mpsc_routing_base;
- void *sdma_intr_base;
+ void __iomem *mpsc_routing_base;
+ void __iomem *sdma_intr_base;
u32 MPSC_MRR_m;
u32 MPSC_RCRR_m;
@@ -120,9 +120,9 @@ struct mpsc_port_info {
phys_addr_t brg_base_p;
/* Virtual addresses of various blocks of registers (from platform) */
- void *mpsc_base;
- void *sdma_base;
- void *brg_base;
+ void __iomem *mpsc_base;
+ void __iomem *sdma_base;
+ void __iomem *brg_base;
/* Descriptor ring and buffer allocations */
void *dma_region;