path: root/include
diff options
authorDavid S. Miller <>2012-02-04 16:42:19 -0500
committerDavid S. Miller <>2012-02-04 16:42:19 -0500
commitd07d4c239bbf428db5581ccd5ca3770bbd15bfbd (patch)
tree969df78fbbc76b9ff1289e154b641a06f983569b /include
parentdd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (diff)
parentaabdfd6adb804d0aaba0188ade0f1afe42a52e31 (diff)
Merge branch 'master' of git://
Conflicts: drivers/net/can/usb/ems_usb.c Minor dev_warn --> netdev_warn conversion conflicts.
Diffstat (limited to 'include')
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index a0969fcb72b..5d2efe7e3f1 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -92,7 +92,7 @@ void can_bus_off(struct net_device *dev);
void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
unsigned int idx);
-void can_get_echo_skb(struct net_device *dev, unsigned int idx);
+unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx);
void can_free_echo_skb(struct net_device *dev, unsigned int idx);
struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);