diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-25 16:20:10 -0400 |
| commit | 404e86e1550cc2c84bb57a372af784585c732f9a (patch) | |
| tree | c0e8e2d61c1b1c79705c0dc9f0f16e35267286e4 /include/linux/usbdevice_fs.h | |
| parent | 0206e61b467fde4d7b50f1a64355182a4fd9576b (diff) | |
| parent | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/usbdevice_fs.h')
| -rw-r--r-- | include/linux/usbdevice_fs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h index 17cb108b7db0..3118ede2c67b 100644 --- a/include/linux/usbdevice_fs.h +++ b/include/linux/usbdevice_fs.h | |||
| @@ -77,8 +77,11 @@ struct usbdevfs_connectinfo { | |||
| 77 | unsigned char slow; | 77 | unsigned char slow; |
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| 80 | #define USBDEVFS_URB_SHORT_NOT_OK 1 | 80 | #define USBDEVFS_URB_SHORT_NOT_OK 0x01 |
| 81 | #define USBDEVFS_URB_ISO_ASAP 2 | 81 | #define USBDEVFS_URB_ISO_ASAP 0x02 |
| 82 | #define USBDEVFS_URB_NO_FSBR 0x20 | ||
| 83 | #define USBDEVFS_URB_ZERO_PACKET 0x40 | ||
| 84 | #define USBDEVFS_URB_NO_INTERRUPT 0x80 | ||
| 82 | 85 | ||
| 83 | #define USBDEVFS_URB_TYPE_ISO 0 | 86 | #define USBDEVFS_URB_TYPE_ISO 0 |
| 84 | #define USBDEVFS_URB_TYPE_INTERRUPT 1 | 87 | #define USBDEVFS_URB_TYPE_INTERRUPT 1 |