forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	drivers/net/tg3.c
This commit is contained in:
David S. Miller 2011-05-05 14:59:02 -07:00
commit 7143b7d412
28 changed files with 170 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/usb/usbnet.h
View file

@ -68,6 +68,7 @@ struct usbnet {
# define EVENT_RX_PAUSED 5
# define EVENT_DEV_WAKING 6
# define EVENT_DEV_ASLEEP 7
# define EVENT_DEV_OPEN 8
};
static inline struct usb_driver *driver_of(struct usb_interface *intf)