diff options
author | David S. Miller | 2011-05-05 23:59:02 +0200 |
---|---|---|
committer | David S. Miller | 2011-05-05 23:59:02 +0200 |
commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /include | |
parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
parent | can: fix SJA1000 dlc for RTR packets (diff) | |
download | kernel-qcow2-linux-7143b7d41218d4fc2ea33e6056c73609527ae687.tar.gz kernel-qcow2-linux-7143b7d41218d4fc2ea33e6056c73609527ae687.tar.xz kernel-qcow2-linux-7143b7d41218d4fc2ea33e6056c73609527ae687.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/usb/usbnet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 0e1855079fbb..605b0aa8d852 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -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) |