From 14aa4c691ad58c6b69df2e0f25be9ba66fb0848d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 23 Aug 2009 22:57:30 -0700 Subject: [PATCH] --- yaml --- r: 157031 b: refs/heads/master c: d2f3ad4cedc00c8ee848e7abe9b2bbc93b9a8c2d h: refs/heads/master i: 157029: dd1e40c4d0d3fe62267944c35bd3a13807097923 157027: d3e5f29b621b2489376c1b4bb8645138afde6c72 157023: bd611e8641217b2f0f02f50142273feb34442cbc v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/pxaficp_ir.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0322ea481a2a..b1659bcaad9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28e9fc592cb8c7a43e4d3147b38be6032a0e81bc +refs/heads/master: d2f3ad4cedc00c8ee848e7abe9b2bbc93b9a8c2d diff --git a/trunk/drivers/net/irda/pxaficp_ir.c b/trunk/drivers/net/irda/pxaficp_ir.c index 3376a4f39e0a..77d10edefd25 100644 --- a/trunk/drivers/net/irda/pxaficp_ir.c +++ b/trunk/drivers/net/irda/pxaficp_ir.c @@ -803,9 +803,6 @@ static const struct net_device_ops pxa_irda_netdev_ops = { .ndo_stop = pxa_irda_stop, .ndo_start_xmit = pxa_irda_hard_xmit, .ndo_do_ioctl = pxa_irda_ioctl, - .ndo_change_mtu = eth_change_mtu, - .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, }; static int pxa_irda_probe(struct platform_device *pdev) @@ -830,6 +827,7 @@ static int pxa_irda_probe(struct platform_device *pdev) if (!dev) goto err_mem_3; + SET_NETDEV_DEV(dev, &pdev->dev); si = netdev_priv(dev); si->dev = &pdev->dev; si->pdata = pdev->dev.platform_data;