diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-17 13:17:30 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-17 13:17:30 +0800 |
| commit | 3b9608406bb699de5ff02760c745e62212b4c280 (patch) | |
| tree | 1cedd6fff5d0c2f512cee15f74fb9dc867b7e328 /include/linux/can/dev.h | |
| parent | bc275dcec0026997a8a8b685ce65c6f766ff38ce (diff) | |
| parent | 556681e28fda1c92eb2178306904a7df87f37449 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_androidjb4.2.2_1.0.0-ga
Diffstat (limited to 'include/linux/can/dev.h')
| -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 cc0bb4961669..129dbee2c8d6 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -93,7 +93,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); |