diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /drivers/net/irda/pxaficp_ir.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'drivers/net/irda/pxaficp_ir.c')
| -rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 3376a4f39e0a..77d10edefd25 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
| @@ -803,9 +803,6 @@ static const struct net_device_ops pxa_irda_netdev_ops = { | |||
| 803 | .ndo_stop = pxa_irda_stop, | 803 | .ndo_stop = pxa_irda_stop, |
| 804 | .ndo_start_xmit = pxa_irda_hard_xmit, | 804 | .ndo_start_xmit = pxa_irda_hard_xmit, |
| 805 | .ndo_do_ioctl = pxa_irda_ioctl, | 805 | .ndo_do_ioctl = pxa_irda_ioctl, |
| 806 | .ndo_change_mtu = eth_change_mtu, | ||
| 807 | .ndo_validate_addr = eth_validate_addr, | ||
| 808 | .ndo_set_mac_address = eth_mac_addr, | ||
| 809 | }; | 806 | }; |
| 810 | 807 | ||
| 811 | static int pxa_irda_probe(struct platform_device *pdev) | 808 | static int pxa_irda_probe(struct platform_device *pdev) |
| @@ -830,6 +827,7 @@ static int pxa_irda_probe(struct platform_device *pdev) | |||
| 830 | if (!dev) | 827 | if (!dev) |
| 831 | goto err_mem_3; | 828 | goto err_mem_3; |
| 832 | 829 | ||
| 830 | SET_NETDEV_DEV(dev, &pdev->dev); | ||
| 833 | si = netdev_priv(dev); | 831 | si = netdev_priv(dev); |
| 834 | si->dev = &pdev->dev; | 832 | si->dev = &pdev->dev; |
| 835 | si->pdata = pdev->dev.platform_data; | 833 | si->pdata = pdev->dev.platform_data; |