diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 19:44:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-29 19:44:22 +0100 |
| commit | 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch) | |
| tree | d4933996296141103b1f54e563268b23c95d6dd4 /drivers/scsi/eata_pio.c | |
| parent | staging: fix winbond build, needs delay.h (diff) | |
| parent | Un-inline get_pipe_info() helper function (diff) | |
| download | linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.xz linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.zip | |
Merge branch 'master' into work
Diffstat (limited to 'drivers/scsi/eata_pio.c')
| -rw-r--r-- | drivers/scsi/eata_pio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 60886c19065e..4a9641e69f54 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c @@ -335,7 +335,7 @@ static inline unsigned int eata_pio_send_command(unsigned long base, unsigned ch return 0; } -static int eata_pio_queue(struct scsi_cmnd *cmd, +static int eata_pio_queue_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) { unsigned int x, y; @@ -438,6 +438,8 @@ static int eata_pio_queue(struct scsi_cmnd *cmd, return 0; } +static DEF_SCSI_QCMD(eata_pio_queue) + static int eata_pio_abort(struct scsi_cmnd *cmd) { unsigned int loop = 100; |