diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/net/sunbmac.c | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'drivers/net/sunbmac.c')
| -rw-r--r-- | drivers/net/sunbmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 3f342b35a77f..018d0fca9422 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
| @@ -1263,7 +1263,7 @@ static int __devexit bigmac_sbus_remove(struct of_device *op) | |||
| 1263 | 1263 | ||
| 1264 | qec_op = to_of_device(parent); | 1264 | qec_op = to_of_device(parent); |
| 1265 | 1265 | ||
| 1266 | unregister_netdevice(net_dev); | 1266 | unregister_netdev(net_dev); |
| 1267 | 1267 | ||
| 1268 | of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE); | 1268 | of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE); |
| 1269 | of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE); | 1269 | of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE); |