diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 22:07:14 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 22:07:14 +0200 |
| commit | b98138e00d96abc85b100c9b6886f105d9868ab5 (patch) | |
| tree | 407c24077573368925ede8ff8309d67ea84e9981 /drivers/net/ethernet/seeq/ether3.c | |
| parent | 0b40b4b44378f18b3c76384fa1380c24b5cd0f52 (diff) | |
| parent | ac3524b7f5a6b9a744fb7ea19991355354c09afb (diff) | |
Merge branch 'cleanup/__iomem' into next/cleanup2
* cleanup/__iomem:
ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
ARM: ux500: use __iomem pointers for MMIO
Two new cleanup patches that were not already part of the
first cleanup branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/ethernet/seeq/ether3.c')
| -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 { * The SEEQ8005 doesn't like us writing to its registers * too quickly. */ -static inline void ether3_outb(int v, const void __iomem *r) +static inline void ether3_outb(int v, void __iomem *r) { writeb(v, r); udelay(1); } -static inline void ether3_outw(int v, const void __iomem *r) +static inline void ether3_outw(int v, void __iomem *r) { writew(v, r); udelay(1); |