diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 11:44:17 -0500 |
| commit | f333b3f111e9db76109e304df8ee777ace7fbf86 (patch) | |
| tree | ce9a74a7327020c48c80d278e1db5f12552f0fb0 /drivers/net/wan | |
| parent | f4256e301d9800b1e0276404cb01b3ac85b51067 (diff) | |
| parent | 79bfb0a98fdc73ed6a18469cef245cbf50a1d8bb (diff) | |
| download | kernel_samsung_tuna-f333b3f111e9db76109e304df8ee777ace7fbf86.zip kernel_samsung_tuna-f333b3f111e9db76109e304df8ee777ace7fbf86.tar.gz kernel_samsung_tuna-f333b3f111e9db76109e304df8ee777ace7fbf86.tar.bz2 | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/sdladrv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/sdladrv.c b/drivers/net/wan/sdladrv.c index 7c2cf2e..032c0f8 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( |