diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-04 16:42:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-04 16:42:19 -0500 |
| commit | d07d4c239bbf428db5581ccd5ca3770bbd15bfbd (patch) | |
| tree | 969df78fbbc76b9ff1289e154b641a06f983569b /include | |
| parent | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (diff) | |
| parent | aabdfd6adb804d0aaba0188ade0f1afe42a52e31 (diff) | |
Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
Conflicts:
drivers/net/can/usb/ems_usb.c
Minor dev_warn --> netdev_warn conversion conflicts.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/dev.h | 2 |
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); |