diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/scsi/sd.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/scsi/sd.h')
| -rw-r--r-- | include/scsi/sd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/scsi/sd.h b/include/scsi/sd.h index 5261488e1108..ce02ad1f5185 100644 --- a/include/scsi/sd.h +++ b/include/scsi/sd.h | |||
| @@ -56,8 +56,6 @@ static int sd_suspend(struct device *dev, pm_message_t state); | |||
| 56 | static int sd_resume(struct device *dev); | 56 | static int sd_resume(struct device *dev); |
| 57 | static void sd_rescan(struct device *); | 57 | static void sd_rescan(struct device *); |
| 58 | static int sd_init_command(struct scsi_cmnd *); | 58 | static int sd_init_command(struct scsi_cmnd *); |
| 59 | static int sd_issue_flush(struct device *, sector_t *); | ||
| 60 | static void sd_prepare_flush(request_queue_t *, struct request *); | ||
| 61 | static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer); | 59 | static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer); |
| 62 | static void scsi_disk_release(struct class_device *cdev); | 60 | static void scsi_disk_release(struct class_device *cdev); |
| 63 | static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *); | 61 | static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *); |