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/softing | |
parent | fbadadd90c851babb8e118245041ef1fe8e1eb2c (diff) | |
parent | a0c7d83322521880caf8c9c1ef20a2a1cd5cb955 (diff) | |
download | linux-06b0a9a4b272c5bece2910f3c2118189baa684bc.tar.gz linux-06b0a9a4b272c5bece2910f3c2118189baa684bc.tar.bz2 linux-06b0a9a4b272c5bece2910f3c2118189baa684bc.zip |
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/softing')
-rw-r--r-- | drivers/net/can/softing/softing_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c index 65eef1eea2e2..6cd5c01b624d 100644 --- a/drivers/net/can/softing/softing_main.c +++ b/drivers/net/can/softing/softing_main.c @@ -768,7 +768,7 @@ static int softing_pdev_remove(struct platform_device *pdev) static int softing_pdev_probe(struct platform_device *pdev) { - const struct softing_platform_data *pdat = pdev->dev.platform_data; + const struct softing_platform_data *pdat = dev_get_platdata(&pdev->dev); struct softing *card; struct net_device *netdev; struct softing_priv *priv; |