diff options
| author | Andy Grover <agrover@groveronline.com> | 2003-02-04 19:22:39 -0800 |
|---|---|---|
| committer | Andy Grover <agrover@groveronline.com> | 2003-02-04 19:22:39 -0800 |
| commit | 263cc27fa141984aed0e6de7474fc813449d02a3 (patch) | |
| tree | b22302cd0039b993cfba9adf39e33280912a8d9f /include/linux/usb.h | |
| parent | a9b3ee51be65cde06e65cb2915adb89751511623 (diff) | |
| parent | cf5ba9c8989c8451afd1364e46168c180efee124 (diff) | |
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
Diffstat (limited to 'include/linux/usb.h')
| -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; |