summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2005-05-12 20:19:09 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-12 20:19:09 -0400
commiteb1d6988130d5f2716ba1d53197caab0fdc31b94 (patch)
tree3e84d1d21b77d739af7bca35a0da7ef481f7e6d6 /drivers
parent53155109b6ac611d9bb4a4ef9d3109b219b8d0e1 (diff)
downloadop-kernel-dev-eb1d6988130d5f2716ba1d53197caab0fdc31b94.zip
op-kernel-dev-eb1d6988130d5f2716ba1d53197caab0fdc31b94.tar.gz
[PATCH] smc91x warning fix
A few IO addr type conversions were missing. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/smc91x.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index ddd2688..c3bf0cf 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -151,7 +151,7 @@
/* We actually can't write halfwords properly if not word aligned */
static inline void
-SMC_outw(u16 val, unsigned long ioaddr, int reg)
+SMC_outw(u16 val, void __iomem *ioaddr, int reg)
{
if (reg & 2) {
unsigned int v = val << 16;
@@ -317,7 +317,7 @@ static inline void SMC_outsw (unsigned long a, int r, unsigned char* p, int l)
#define SMC_insl(a, r, p, l) \
smc_pxa_dma_insl(a, lp->physaddr, r, dev->dma, p, l)
static inline void
-smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma,
+smc_pxa_dma_insl(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
u_char *buf, int len)
{
dma_addr_t dmabuf;
@@ -355,7 +355,7 @@ smc_pxa_dma_insl(u_long ioaddr, u_long physaddr, int reg, int dma,
#define SMC_insw(a, r, p, l) \
smc_pxa_dma_insw(a, lp->physaddr, r, dev->dma, p, l)
static inline void
-smc_pxa_dma_insw(u_long ioaddr, u_long physaddr, int reg, int dma,
+smc_pxa_dma_insw(void __iomem *ioaddr, u_long physaddr, int reg, int dma,
u_char *buf, int len)
{
dma_addr_t dmabuf;
OpenPOWER on IntegriCloud