From: David S. Miller <davem@davemloft.net>
Date: Sat, 11 Oct 2008 19:39:35 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~706^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=56c5d900dbb8e042bfad035d18433476931d8f93;p=linux-2.6-omap-h63xx.git

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

Conflicts:

	sound/core/memalloc.c
---

56c5d900dbb8e042bfad035d18433476931d8f93
diff --cc drivers/net/myri_sbus.c
index 979d778b133,06e682334c7..3ad7589d6a1
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@@ -1101,12 -1105,20 +1101,12 @@@ err
  	return -ENODEV;
  }
  
 -
 -static int __devinit myri_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 -{
 -	struct sbus_dev *sdev = to_sbus_device(&dev->dev);
 -
 -	return myri_ether_init(sdev);
 -}
 -
 -static int __devexit myri_sbus_remove(struct of_device *dev)
 +static int __devexit myri_sbus_remove(struct of_device *op)
  {
 -	struct myri_eth *mp = dev_get_drvdata(&dev->dev);
 +	struct myri_eth *mp = dev_get_drvdata(&op->dev);
  	struct net_device *net_dev = mp->dev;
  
- 	unregister_netdevice(net_dev);
+ 	unregister_netdev(net_dev);
  
  	free_irq(net_dev->irq, net_dev);
  
diff --cc drivers/net/sunbmac.c
index 3f342b35a77,31e7384e312..018d0fca942
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@@ -1240,39 -1255,35 +1240,39 @@@ fail_and_cleanup
  	return -ENODEV;
  }
  
 -/* QEC can be the parent of either QuadEthernet or
 - * a BigMAC.  We want the latter.
 +/* QEC can be the parent of either QuadEthernet or a BigMAC.  We want
 + * the latter.
   */
 -static int __devinit bigmac_sbus_probe(struct of_device *dev, const struct of_device_id *match)
 +static int __devinit bigmac_sbus_probe(struct of_device *op,
 +				       const struct of_device_id *match)
  {
 -	struct sbus_dev *sdev = to_sbus_device(&dev->dev);
 -	struct device_node *dp = dev->node;
 +	struct device *parent = op->dev.parent;
 +	struct of_device *qec_op;
  
 -	if (!strcmp(dp->name, "be"))
 -		sdev = sdev->parent;
 +	qec_op = to_of_device(parent);
  
 -	return bigmac_ether_init(sdev);
 +	return bigmac_ether_init(op, qec_op);
  }
  
 -static int __devexit bigmac_sbus_remove(struct of_device *dev)
 +static int __devexit bigmac_sbus_remove(struct of_device *op)
  {
 -	struct bigmac *bp = dev_get_drvdata(&dev->dev);
 +	struct bigmac *bp = dev_get_drvdata(&op->dev);
 +	struct device *parent = op->dev.parent;
  	struct net_device *net_dev = bp->dev;
 +	struct of_device *qec_op;
 +
 +	qec_op = to_of_device(parent);
  
- 	unregister_netdevice(net_dev);
+ 	unregister_netdev(net_dev);
  
 -	sbus_iounmap(bp->gregs, GLOB_REG_SIZE);
 -	sbus_iounmap(bp->creg, CREG_REG_SIZE);
 -	sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
 -	sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
 -	sbus_free_consistent(bp->bigmac_sdev,
 -			     PAGE_SIZE,
 -			     bp->bmac_block,
 -			     bp->bblock_dvma);
 +	of_iounmap(&qec_op->resource[0], bp->gregs, GLOB_REG_SIZE);
 +	of_iounmap(&op->resource[0], bp->creg, CREG_REG_SIZE);
 +	of_iounmap(&op->resource[1], bp->bregs, BMAC_REG_SIZE);
 +	of_iounmap(&op->resource[2], bp->tregs, TCVR_REG_SIZE);
 +	dma_free_coherent(&op->dev,
 +			  PAGE_SIZE,
 +			  bp->bmac_block,
 +			  bp->bblock_dvma);
  
  	free_netdev(net_dev);