diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-01 01:14:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-01 01:14:20 +0200 |
| commit | 06b0a9a4b272c5bece2910f3c2118189baa684bc (patch) | |
| tree | 5fd5616326842efcebbd0e57587e37077fb3a557 /drivers/net/can/softing | |
| parent | ipv6: Not need to set fl6.flowi6_flags as zero (diff) | |
| parent | can: sja1000: remove unnecessary pci_set_drvdata() (diff) | |
| download | linux-06b0a9a4b272c5bece2910f3c2118189baa684bc.tar.xz 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; |