Merge branch 'sh/iomap'

[pandora-kernel.git] / drivers / net / can / bfin_can.c

diff --git a/drivers/net/can/bfin_can.c b/drivers/net/can/bfin_can.c
index 0348986..b6e890d 100644 (file)
--- a/drivers/net/can/bfin_can.c
+++ b/drivers/net/can/bfin_can.c
@@ -18,7 +18,6 @@
 #include <linux/skbuff.h>
 #include <linux/platform_device.h>
 
-#include <linux/can.h>
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 
@@ -270,8 +269,6 @@ static int bfin_can_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* fill data length code */
        bfin_write16(&reg->chl[TRANSMIT_CHL].dlc, dlc);
 
-       dev->trans_start = jiffies;
-
        can_put_echo_skb(skb, dev, 0);
 
        /* set transmit request */