diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 06:48:32 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 06:48:32 +0200 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /drivers/net/jazzsonic.c | |
| parent | video: sh_mobile_lcdcfb: use both register sets for display panning (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 (diff) | |
| download | linux-ea88023b3491a384575ebcd5e8a449e841a28a24.tar.xz linux-ea88023b3491a384575ebcd5e8a449e841a28a24.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'drivers/net/jazzsonic.c')
| -rw-r--r-- | drivers/net/jazzsonic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index 2f286091394d..6e5b3f30527f 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c @@ -108,7 +108,7 @@ static const struct net_device_ops sonic_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, }; -static int __init sonic_probe1(struct net_device *dev) +static int __devinit sonic_probe1(struct net_device *dev) { static unsigned version_printed; unsigned int silicon_revision; @@ -203,7 +203,7 @@ static int __init sonic_probe1(struct net_device *dev) return 0; out: - release_region(dev->base_addr, SONIC_MEM_SIZE); + release_mem_region(dev->base_addr, SONIC_MEM_SIZE); return err; } @@ -211,7 +211,7 @@ out: * Probe for a SONIC ethernet controller on a Mips Jazz board. * Actually probing is superfluous but we're paranoid. */ -static int __init jazz_sonic_probe(struct platform_device *pdev) +static int __devinit jazz_sonic_probe(struct platform_device *pdev) { struct net_device *dev; struct sonic_local *lp; @@ -247,7 +247,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev) return 0; out1: - release_region(dev->base_addr, SONIC_MEM_SIZE); + release_mem_region(dev->base_addr, SONIC_MEM_SIZE); out: free_netdev(dev); @@ -269,7 +269,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev) unregister_netdev(dev); dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode), lp->descriptors, lp->descriptors_laddr); - release_region (dev->base_addr, SONIC_MEM_SIZE); + release_mem_region(dev->base_addr, SONIC_MEM_SIZE); free_netdev(dev); return 0; |