diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-03 17:26:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-03 17:26:56 -0800 |
| commit | 20b397bb4756a236588f87a4cbd2153eb27d6229 (patch) | |
| tree | 162bb20bfcc85005e18f5df7116bbe1e3c397115 /include/linux | |
| parent | 46b11ba936036868bd84dc0777f835af7851b1e1 (diff) | |
| parent | fb6d52e5e68fb72d10592525c869ac8c98edbfd2 (diff) | |
Merge
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 9f465bfd8179..cb5c0db14aa1 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -554,7 +554,6 @@ extern int usb_disabled(void); #define URB_NO_FSBR 0x0020 /* UHCI-specific */ #define URB_ZERO_PACKET 0x0040 /* Finish bulk OUTs with short packet */ #define URB_NO_INTERRUPT 0x0080 /* HINT: no non-error interrupt needed */ -#define URB_TIMEOUT_KILLED 0x1000 /* only set by HCD! */ struct usb_iso_packet_descriptor { unsigned int offset; |