leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

Browse Source 
Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.
This commit is contained in:
David S. Miller
2012-02-04 16:42:19 -05:00
parent dd48dc34fe aabdfd6adb
commit d07d4c239b
14 changed files with 192 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/can/dev.h
View File

@@ -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);