diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /drivers/usb/storage/usb.h | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/usb/storage/usb.h')
| -rw-r--r-- | drivers/usb/storage/usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h index 6445665b1577..8d87503e2560 100644 --- a/drivers/usb/storage/usb.h +++ b/drivers/usb/storage/usb.h | |||
| @@ -150,6 +150,7 @@ struct us_data { | |||
| 150 | struct semaphore sema; /* to sleep thread on */ | 150 | struct semaphore sema; /* to sleep thread on */ |
| 151 | struct completion notify; /* thread begin/end */ | 151 | struct completion notify; /* thread begin/end */ |
| 152 | wait_queue_head_t delay_wait; /* wait during scan, reset */ | 152 | wait_queue_head_t delay_wait; /* wait during scan, reset */ |
| 153 | struct completion scanning_done; /* wait for scan thread */ | ||
| 153 | 154 | ||
| 154 | /* subdriver information */ | 155 | /* subdriver information */ |
| 155 | void *extra; /* Any extra data */ | 156 | void *extra; /* Any extra data */ |