diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/libata.h | 4 | ||||
-rw-r--r-- | include/scsi/scsi_host.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index fbe8ba212598..c52f13498556 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -520,9 +520,9 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); | |||
520 | extern int ata_scsi_release(struct Scsi_Host *host); | 520 | extern int ata_scsi_release(struct Scsi_Host *host); |
521 | extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); | 521 | extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); |
522 | extern int ata_scsi_device_resume(struct scsi_device *); | 522 | extern int ata_scsi_device_resume(struct scsi_device *); |
523 | extern int ata_scsi_device_suspend(struct scsi_device *); | 523 | extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state); |
524 | extern int ata_device_resume(struct ata_port *, struct ata_device *); | 524 | extern int ata_device_resume(struct ata_port *, struct ata_device *); |
525 | extern int ata_device_suspend(struct ata_port *, struct ata_device *); | 525 | extern int ata_device_suspend(struct ata_port *, struct ata_device *, pm_message_t state); |
526 | extern int ata_ratelimit(void); | 526 | extern int ata_ratelimit(void); |
527 | extern unsigned int ata_busy_sleep(struct ata_port *ap, | 527 | extern unsigned int ata_busy_sleep(struct ata_port *ap, |
528 | unsigned long timeout_pat, | 528 | unsigned long timeout_pat, |
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index a6cf3e535c0b..dc6862d09e53 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
@@ -286,7 +286,7 @@ struct scsi_host_template { | |||
286 | * suspend support | 286 | * suspend support |
287 | */ | 287 | */ |
288 | int (*resume)(struct scsi_device *); | 288 | int (*resume)(struct scsi_device *); |
289 | int (*suspend)(struct scsi_device *); | 289 | int (*suspend)(struct scsi_device *, pm_message_t state); |
290 | 290 | ||
291 | /* | 291 | /* |
292 | * Name of proc directory | 292 | * Name of proc directory |