Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[powerpc.git] / drivers / usb / storage / usb.h

diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index dfa4dc7..98b0971 100644 (file)
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -161,9 +161,6 @@ struct us_data {
        struct scsi_cmnd        *srb;            /* current srb         */
        unsigned int            tag;             /* current dCBWTag     */
 
-       /* thread information */
-       int                     pid;             /* control thread       */
-
        /* control and bulk communications data */
        struct urb              *current_urb;    /* USB requests         */
        struct usb_ctrlrequest  *cr;             /* control requests     */