diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
| commit | 638cbac8de9b57345a9446e107b6aebc10b58970 (patch) | |
| tree | e445fe3a1b8ad718d7ee770ed1c7a43e3eb5a611 /drivers/net/wan | |
| parent | f055408957750cf759162c364c2a4dfe19765844 (diff) | |
| parent | fc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff) | |
Merge branch 'master'
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 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) | |||
| 1994 | modname, hw->irq); | 1994 | modname, hw->irq); |
| 1995 | 1995 | ||
| 1996 | /* map the physical PCI memory to virtual memory */ | 1996 | /* map the physical PCI memory to virtual memory */ |
| 1997 | (void *)hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr, | 1997 | hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr, |
| 1998 | (unsigned long)MAX_SIZEOF_S514_MEMORY); | 1998 | (unsigned long)MAX_SIZEOF_S514_MEMORY); |
| 1999 | /* map the physical control register memory to virtual memory */ | 1999 | /* map the physical control register memory to virtual memory */ |
| 2000 | hw->vector = (unsigned long)ioremap( | 2000 | hw->vector = (unsigned long)ioremap( |