aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/softing
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-09-30 19:14:20 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-30 19:14:20 -0400
commit06b0a9a4b272c5bece2910f3c2118189baa684bc (patch)
tree5fd5616326842efcebbd0e57587e37077fb3a557 /drivers/net/can/softing
parentfbadadd90c851babb8e118245041ef1fe8e1eb2c (diff)
parenta0c7d83322521880caf8c9c1ef20a2a1cd5cb955 (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/softing')
-rw-r--r--drivers/net/can/softing/softing_main.c2
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)
768 768
769static int softing_pdev_probe(struct platform_device *pdev) 769static int softing_pdev_probe(struct platform_device *pdev)
770{ 770{
771 const struct softing_platform_data *pdat = pdev->dev.platform_data; 771 const struct softing_platform_data *pdat = dev_get_platdata(&pdev->dev);
772 struct softing *card; 772 struct softing *card;
773 struct net_device *netdev; 773 struct net_device *netdev;
774 struct softing_priv *priv; 774 struct softing_priv *priv;