diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
| commit | d954896edb658cf72dd069d92b5235c06521ffab (patch) | |
| tree | fe8b798176191c681c6b2fa1c81aa55dc98568dc /include/linux/usb/usbnet.h | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
Merge branch 'timers/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-rmk/broadcast
Diffstat (limited to 'include/linux/usb/usbnet.h')
| -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 bd45eb7bedc8..5de7a220e986 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
| @@ -100,6 +100,7 @@ struct driver_info { | |||
| 100 | #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ | 100 | #define FLAG_LINK_INTR 0x0800 /* updates link (carrier) status */ |
| 101 | 101 | ||
| 102 | #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ | 102 | #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ |
| 103 | #define FLAG_NOARP 0x2000 /* device can't do ARP */ | ||
| 103 | 104 | ||
| 104 | /* | 105 | /* |
| 105 | * Indicates to usbnet, that USB driver accumulates multiple IP packets. | 106 | * Indicates to usbnet, that USB driver accumulates multiple IP packets. |