Merge branch 'acpi' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

[linux-2.6] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index b5c226a87ed87640252139a6dda2f701aa4636bc..a8e8d1ecebb17b4bbcd6e36c93d18947e78624b1 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -935,7 +935,7 @@ struct usb_iso_packet_descriptor {
        unsigned int offset;
        unsigned int length;            /* expected length */
        unsigned int actual_length;
-       unsigned int status;
+       int status;
 };
 
 struct urb;