ntp: handle leap second via timer

[linux-2.6-omap-h63xx.git] / include / linux / usbdevice_fs.h

diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h
index 342dd5a7e8bb822f139955bb91ba9cab069b3e2f..3118ede2c67b3f35c18b7ea326c63220c0cdc4f1 100644 (file)
--- a/include/linux/usbdevice_fs.h
+++ b/include/linux/usbdevice_fs.h
@@ -77,8 +77,11 @@ struct usbdevfs_connectinfo {
        unsigned char slow;
 };
 
-#define USBDEVFS_URB_SHORT_NOT_OK          1
-#define USBDEVFS_URB_ISO_ASAP              2
+#define USBDEVFS_URB_SHORT_NOT_OK      0x01
+#define USBDEVFS_URB_ISO_ASAP          0x02
+#define USBDEVFS_URB_NO_FSBR           0x20
+#define USBDEVFS_URB_ZERO_PACKET       0x40
+#define USBDEVFS_URB_NO_INTERRUPT      0x80
 
 #define USBDEVFS_URB_TYPE_ISO             0
 #define USBDEVFS_URB_TYPE_INTERRUPT       1
@@ -102,8 +105,9 @@ struct usbdevfs_urb {
        int start_frame;
        int number_of_packets;
        int error_count;
-       unsigned int signr;  /* signal to be sent on error, -1 if none should be sent */
-       void *usercontext;
+       unsigned int signr;     /* signal to be sent on completion,
+                                 or 0 if none should be sent. */
+       void __user *usercontext;
        struct usbdevfs_iso_packet_desc iso_frame_desc[0];
 };