diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 21:08:14 -0700 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/usb/storage/transport.h | |
| parent | 974f7bc5781d3fc16e32d8908c6e48592e767dd2 (diff) | |
| parent | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (diff) | |
| download | op-kernel-dev-1f419cadff55f548e7356ffebdb9e1b5a8c22275.zip op-kernel-dev-1f419cadff55f548e7356ffebdb9e1b5a8c22275.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/storage/transport.h')
| -rw-r--r-- | drivers/usb/storage/transport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/transport.h b/drivers/usb/storage/transport.h index 8d9e066..0a362cc 100644 --- a/drivers/usb/storage/transport.h +++ b/drivers/usb/storage/transport.h @@ -50,7 +50,7 @@ #define US_PR_CB 0x01 /* Control/Bulk w/o interrupt */ #define US_PR_BULK 0x50 /* bulk only */ #ifdef CONFIG_USB_STORAGE_USBAT -#define US_PR_SCM_ATAPI 0x80 /* SCM-ATAPI bridge */ +#define US_PR_USBAT 0x80 /* SCM-ATAPI bridge */ #endif #ifdef CONFIG_USB_STORAGE_SDDR09 #define US_PR_EUSB_SDDR09 0x81 /* SCM-SCSI bridge for SDDR-09 */ |
