diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 02:24:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-25 02:24:16 -0400 |
| commit | a4083c9271e0a697278e089f2c0b9a95363ada0a (patch) | |
| tree | db82449c18bc1410091d39f29c59d47379dd9ec5 /include/linux/usb_usual.h | |
| parent | 4742dc1d7670bd00253d2dfb637d55446dc6ef81 (diff) | |
| parent | 7fdba2f2917da4403044d9ea5d239f9cc0e9693d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: Fix cut-and-paste error in rtl8150.c
USB: ehci: stop vt6212 bus hogging
USB: sierra: add another device id
USB: sierra: dma fixes
USB: add support for Motorola ROKR Z6 cellphone in mass storage mode
USB: isd200: fix memory leak in isd200_get_inquiry_data
USB: pl2303: another product ID
USB: new quirk flag to avoid Set-Interface
USB: fix gadgetfs class request delegation
Diffstat (limited to 'include/linux/usb_usual.h')
| -rw-r--r-- | include/linux/usb_usual.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index cee0623b3c7b..0a40dfa44c9f 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h | |||
| @@ -50,7 +50,9 @@ | |||
| 50 | US_FLAG(CAPACITY_HEURISTICS, 0x00001000) \ | 50 | US_FLAG(CAPACITY_HEURISTICS, 0x00001000) \ |
| 51 | /* sometimes sizes is too big */ \ | 51 | /* sometimes sizes is too big */ \ |
| 52 | US_FLAG(MAX_SECTORS_MIN,0x00002000) \ | 52 | US_FLAG(MAX_SECTORS_MIN,0x00002000) \ |
| 53 | /* Sets max_sectors to arch min */ | 53 | /* Sets max_sectors to arch min */ \ |
| 54 | US_FLAG(BULK_IGNORE_TAG,0x00004000) \ | ||
| 55 | /* Ignore tag mismatch in bulk operations */ | ||
| 54 | 56 | ||
| 55 | 57 | ||
| 56 | #define US_FLAG(name, value) US_FL_##name = value , | 58 | #define US_FLAG(name, value) US_FL_##name = value , |