diff options
| author | David S. Miller <davem@davemloft.net> | 2013-09-30 19:14:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-30 19:14:20 -0400 |
| commit | 06b0a9a4b272c5bece2910f3c2118189baa684bc (patch) | |
| tree | 5fd5616326842efcebbd0e57587e37077fb3a557 /drivers/net/can/at91_can.c | |
| parent | fbadadd90c851babb8e118245041ef1fe8e1eb2c (diff) | |
| parent | a0c7d83322521880caf8c9c1ef20a2a1cd5cb955 (diff) | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/at91_can.c')
| -rw-r--r-- | drivers/net/can/at91_can.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c index 3b1ff6148702..64f2efaf7638 100644 --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c @@ -1347,7 +1347,7 @@ static int at91_can_probe(struct platform_device *pdev) priv->reg_base = addr; priv->devtype_data = *devtype_data; priv->clk = clk; - priv->pdata = pdev->dev.platform_data; + priv->pdata = dev_get_platdata(&pdev->dev); priv->mb0_id = 0x7ff; netif_napi_add(dev, &priv->napi, at91_poll, get_mb_rx_num(priv)); |