Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / drivers / net / wan / sdladrv.c

diff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c
index 7c2cf2e76300c4f7fce69777653da0742bfdb8d7..032c0f81928e110f0b152c11e2b8085f465dfd9a 100644 (file)
--- 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(