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/mcp251x.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/mcp251x.c')
| -rw-r--r-- | drivers/net/can/mcp251x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c index fe7dd696957e..08ac401e0214 100644 --- a/drivers/net/can/mcp251x.c +++ b/drivers/net/can/mcp251x.c @@ -999,7 +999,7 @@ static int mcp251x_can_probe(struct spi_device *spi) { struct net_device *net; struct mcp251x_priv *priv; - struct mcp251x_platform_data *pdata = spi->dev.platform_data; + struct mcp251x_platform_data *pdata = dev_get_platdata(&spi->dev); int ret = -ENODEV; if (!pdata) |