diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-09-06 18:52:54 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-09-06 18:52:54 -0400 |
| commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
| tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /drivers/scsi/ibmvscsi/ibmvscsi.h | |
| parent | 3173d8c342971a03857d8af749a3f57da7d06b57 (diff) | |
| parent | fe1b2d544d71300f8e2d151c3c77a130d13a58be (diff) | |
Merge by hand (conflicts in sd.c)
Diffstat (limited to 'drivers/scsi/ibmvscsi/ibmvscsi.h')
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h index 1030b703c30e..8bec0438dc8a 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.h +++ b/drivers/scsi/ibmvscsi/ibmvscsi.h | |||
| @@ -68,6 +68,8 @@ struct srp_event_struct { | |||
| 68 | void (*cmnd_done) (struct scsi_cmnd *); | 68 | void (*cmnd_done) (struct scsi_cmnd *); |
| 69 | struct completion comp; | 69 | struct completion comp; |
| 70 | union viosrp_iu *sync_srp; | 70 | union viosrp_iu *sync_srp; |
| 71 | struct memory_descriptor *ext_list; | ||
| 72 | dma_addr_t ext_list_token; | ||
| 71 | }; | 73 | }; |
| 72 | 74 | ||
| 73 | /* a pool of event structs for use */ | 75 | /* a pool of event structs for use */ |