lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	sound/core/memalloc.c
This commit is contained in:
David S. Miller
2008-10-11 12:39:35 -07:00
parent 4dd95b63ae ead9d23d80
commit 56c5d900db
3711 changed files with 190093 additions and 87746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/sunbmac.c
View File

@ -1263,7 +1263,7 @@ static int __devexit bigmac_sbus_remove(struct of_device *op)
qec_op = to_of_device(parent);
unregister_netdevice(net_dev);
unregister_netdev(net_dev);
of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE);
of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE);