diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-29 01:44:01 -0500 |
| commit | ca19e77e44985b5500f5461f7d2f4ce799cb60ce (patch) | |
| tree | 3ba3635ac2f212b332198b14cc3239195c153e67 /drivers/scsi/g_NCR5380.h | |
| parent | 9d57883f08d3c0c111b50bf185dfee9731a12c76 (diff) | |
| parent | ac70eb1305d5a81efd1e32327d7e79be15a63a5a (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/scsi/g_NCR5380.h')
| -rw-r--r-- | drivers/scsi/g_NCR5380.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h index 921764c9ab24..1bcdb7beb77b 100644 --- a/drivers/scsi/g_NCR5380.h +++ b/drivers/scsi/g_NCR5380.h | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | static int generic_NCR5380_abort(Scsi_Cmnd *); | 46 | static int generic_NCR5380_abort(Scsi_Cmnd *); |
| 47 | static int generic_NCR5380_detect(struct scsi_host_template *); | 47 | static int generic_NCR5380_detect(struct scsi_host_template *); |
| 48 | static int generic_NCR5380_release_resources(struct Scsi_Host *); | 48 | static int generic_NCR5380_release_resources(struct Scsi_Host *); |
| 49 | static int generic_NCR5380_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); | 49 | static int generic_NCR5380_queue_command(struct Scsi_Host *, struct scsi_cmnd *); |
| 50 | static int generic_NCR5380_bus_reset(Scsi_Cmnd *); | 50 | static int generic_NCR5380_bus_reset(Scsi_Cmnd *); |
| 51 | static const char* generic_NCR5380_info(struct Scsi_Host *); | 51 | static const char* generic_NCR5380_info(struct Scsi_Host *); |
| 52 | 52 | ||