linux-next: manual merge of the akpm tree with the net-next tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/net/can/c_can/c_can_platform.c between commit 33f810097769 ("can:
c_can: Move overlay structure to array with offset as index") from the
net-next tree and commit "net/c_can: remove conditional compilation of
clk code" from the akpm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/can/c_can/c_can_platform.c
index f0921d1,7ec9316..0000000

--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c

@@@ -71,10 -71,8 +71,9 @@@ static int __devinit c_can_plat_probe(s
  	void __iomem *addr;
  	struct net_device *dev;
  	struct c_can_priv *priv;
 +	const struct platform_device_id *id;
  	struct resource *mem;
  	int irq;
- #ifdef CONFIG_HAVE_CLK
  	struct clk *clk;
  
  	/* get the appropriate clk */
@@@ -138,18 -129,8 +136,16 @@@
  		priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
  		priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
  		break;
 +	default:
 +		ret = -EINVAL;
 +		goto exit_free_device;
  	}
  
 +	dev->irq = irq;
 +	priv->base = addr;
- #ifdef CONFIG_HAVE_CLK
 +	priv->can.clock.freq = clk_get_rate(clk);
 +	priv->priv = clk;
- #endif
 +
  	platform_set_drvdata(pdev, dev);
  	SET_NETDEV_DEV(dev, &pdev->dev);