diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-22 13:24:06 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-22 13:24:29 -0400 |
commit | 268aebe4d04bf2ac1e839eff2c83519768460189 (patch) | |
tree | b456d91c8e495e0fb0aa84bd8708bed62b1e8dc4 /drivers/net/ethernet/seeq | |
parent | 60e59920152c7bafc8a2eb3031a62f22c2bc9e95 (diff) | |
parent | a019c5e25190107a88377cde8918c169d15a7add (diff) |
Merge branch 'cleanup/__iomem' into next/cleanup
__iomem annotation cleanup branch from Arnd.
* cleanup/__iomem: (21 commits)
net: seeq: use __iomem pointers for MMIO
video: da8xx-fb: use __iomem pointers for MMIO
scsi: eesox: use __iomem pointers for MMIO
serial: ks8695: use __iomem pointers for MMIO
input: rpcmouse: use __iomem pointers for MMIO
ARM: samsung: use __iomem pointers for MMIO
ARM: spear13xx: use __iomem pointers for MMIO
ARM: sa1100: use __iomem pointers for MMIO
ARM: prima2: use __iomem pointers for MMIO
ARM: nomadik: use __iomem pointers for MMIO
ARM: msm: use __iomem pointers for MMIO
ARM: lpc32xx: use __iomem pointers for MMIO
ARM: ks8695: use __iomem pointers for MMIO
ARM: ixp4xx: use __iomem pointers for MMIO
ARM: iop32x: use __iomem pointers for MMIO
ARM: iop13xx: use __iomem pointers for MMIO
ARM: integrator: use __iomem pointers for MMIO
ARM: imx: use __iomem pointers for MMIO
ARM: ebsa110: use __iomem pointers for MMIO
ARM: at91: use __iomem pointers for MMIO
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/net/ethernet/seeq')
-rw-r--r-- | drivers/net/ethernet/seeq/ether3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c index df808ac8cb65..6a40dd03a32f 100644 --- a/drivers/net/ethernet/seeq/ether3.c +++ b/drivers/net/ethernet/seeq/ether3.c | |||
@@ -99,13 +99,13 @@ typedef enum { | |||
99 | * The SEEQ8005 doesn't like us writing to its registers | 99 | * The SEEQ8005 doesn't like us writing to its registers |
100 | * too quickly. | 100 | * too quickly. |
101 | */ | 101 | */ |
102 | static inline void ether3_outb(int v, const void __iomem *r) | 102 | static inline void ether3_outb(int v, void __iomem *r) |
103 | { | 103 | { |
104 | writeb(v, r); | 104 | writeb(v, r); |
105 | udelay(1); | 105 | udelay(1); |
106 | } | 106 | } |
107 | 107 | ||
108 | static inline void ether3_outw(int v, const void __iomem *r) | 108 | static inline void ether3_outw(int v, void __iomem *r) |
109 | { | 109 | { |
110 | writew(v, r); | 110 | writew(v, r); |
111 | udelay(1); | 111 | udelay(1); |