mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/tg3.c
This commit is contained in:
commit
7143b7d412
28 changed files with 170 additions and 66 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue