diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 12:25:38 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 12:25:38 +0100 |
commit | 8ab7913675726e5ae23b91221c0b5442d986d44a (patch) | |
tree | f2673dcb25e864cc87abe3f2d58db9bf9730f148 /drivers/net/can/rcar_can.c | |
parent | 864b94adfcba752aa902ee34497bbe58b97aa8d3 (diff) | |
parent | 3a5dc1fafb016560315fe45bb4ef8bde259dd1bc (diff) |
Merge branch 'x86/vt-d' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into x86/apic-picks
Required to apply Jiangs x86 irq handling rework without creating a
nightmare of conflicts.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/can/rcar_can.c')
-rw-r--r-- | drivers/net/can/rcar_can.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/rcar_can.c b/drivers/net/can/rcar_can.c index 1abe133d1594..9718248e55f1 100644 --- a/drivers/net/can/rcar_can.c +++ b/drivers/net/can/rcar_can.c @@ -628,6 +628,7 @@ static const struct net_device_ops rcar_can_netdev_ops = { .ndo_open = rcar_can_open, .ndo_stop = rcar_can_close, .ndo_start_xmit = rcar_can_start_xmit, + .ndo_change_mtu = can_change_mtu, }; static void rcar_can_rx_pkt(struct rcar_can_priv *priv) |