summaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/sdladrv.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-15 20:56:07 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-15 20:56:07 -0500
commit77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch)
tree805db8c5c180ee7ee85b3c484461100c91f6c781 /drivers/net/wan/sdladrv.c
parent68bdbdf0b32566e1ebd41415bde9a7c43b47bf48 (diff)
parentf6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff)
downloadtalos-obmc-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.tar.gz
talos-obmc-linux-77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db.zip
Merge branch 'master'
Diffstat (limited to 'drivers/net/wan/sdladrv.c')
-rw-r--r--drivers/net/wan/sdladrv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c
index 7c2cf2e76300..032c0f81928e 100644
--- a/drivers/net/wan/sdladrv.c
+++ b/drivers/net/wan/sdladrv.c
@@ -1994,7 +1994,7 @@ static int detect_s514 (sdlahw_t* hw)
modname, hw->irq);
/* map the physical PCI memory to virtual memory */
- (void *)hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,
+ hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,
(unsigned long)MAX_SIZEOF_S514_MEMORY);
/* map the physical control register memory to virtual memory */
hw->vector = (unsigned long)ioremap(
OpenPOWER on IntegriCloud