diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /include/linux/usb_usual.h | |
| parent | c9d557c19f94df42db78d4a5de4d25feee694bad (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'include/linux/usb_usual.h')
| -rw-r--r-- | include/linux/usb_usual.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h index d9a3bbe38e6b..1eea1ab68dc4 100644 --- a/include/linux/usb_usual.h +++ b/include/linux/usb_usual.h | |||
| @@ -52,8 +52,11 @@ | |||
| 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) \ | 54 | US_FLAG(BULK_IGNORE_TAG,0x00004000) \ |
| 55 | /* Ignore tag mismatch in bulk operations */ | 55 | /* Ignore tag mismatch in bulk operations */ \ |
| 56 | 56 | US_FLAG(SANE_SENSE, 0x00008000) \ | |
| 57 | /* Sane Sense (> 18 bytes) */ \ | ||
| 58 | US_FLAG(CAPACITY_OK, 0x00010000) \ | ||
| 59 | /* READ CAPACITY response is correct */ | ||
| 57 | 60 | ||
| 58 | #define US_FLAG(name, value) US_FL_##name = value , | 61 | #define US_FLAG(name, value) US_FL_##name = value , |
| 59 | enum { US_DO_ALL_FLAGS }; | 62 | enum { US_DO_ALL_FLAGS }; |