diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/scsi/NCR53C9x.h | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/NCR53C9x.h')
| -rw-r--r-- | drivers/scsi/NCR53C9x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/NCR53C9x.h b/drivers/scsi/NCR53C9x.h index 521e3f842cfd..d85cb73a9f69 100644 --- a/drivers/scsi/NCR53C9x.h +++ b/drivers/scsi/NCR53C9x.h | |||
| @@ -652,7 +652,7 @@ extern int nesps, esps_in_use, esps_running; | |||
| 652 | 652 | ||
| 653 | /* External functions */ | 653 | /* External functions */ |
| 654 | extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs); | 654 | extern void esp_bootup_reset(struct NCR_ESP *esp, struct ESP_regs *eregs); |
| 655 | extern struct NCR_ESP *esp_allocate(struct scsi_host_template *, void *); | 655 | extern struct NCR_ESP *esp_allocate(struct scsi_host_template *, void *, int); |
| 656 | extern void esp_deallocate(struct NCR_ESP *); | 656 | extern void esp_deallocate(struct NCR_ESP *); |
| 657 | extern void esp_release(void); | 657 | extern void esp_release(void); |
| 658 | extern void esp_initialize(struct NCR_ESP *); | 658 | extern void esp_initialize(struct NCR_ESP *); |