diff options
author | James Bottomley <jejb@titanic> | 2005-04-18 14:45:00 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic> | 2005-04-18 14:45:00 -0400 |
commit | c46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch) | |
tree | 284912295d46a861930d0619788a650f56c2a29b /drivers/scsi/sg.c | |
parent | c2a9331c62216e222a08de8dd58559367fef0af6 (diff) | |
parent | f59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff) |
merge by hand (scsi_device.h)
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r-- | drivers/scsi/sg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 32de9aabcb99..ce8332297dfa 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -51,6 +51,7 @@ static int sg_version_num = 30533; /* 2 digits for each component */ | |||
51 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
52 | 52 | ||
53 | #include "scsi.h" | 53 | #include "scsi.h" |
54 | #include <scsi/scsi_dbg.h> | ||
54 | #include <scsi/scsi_host.h> | 55 | #include <scsi/scsi_host.h> |
55 | #include <scsi/scsi_driver.h> | 56 | #include <scsi/scsi_driver.h> |
56 | #include <scsi/scsi_ioctl.h> | 57 | #include <scsi/scsi_ioctl.h> |
@@ -1368,7 +1369,7 @@ sg_cmd_done(Scsi_Cmnd * SCpnt) | |||
1368 | if ((sdp->sgdebug > 0) && | 1369 | if ((sdp->sgdebug > 0) && |
1369 | ((CHECK_CONDITION == srp->header.masked_status) || | 1370 | ((CHECK_CONDITION == srp->header.masked_status) || |
1370 | (COMMAND_TERMINATED == srp->header.masked_status))) | 1371 | (COMMAND_TERMINATED == srp->header.masked_status))) |
1371 | print_req_sense("sg_cmd_done", SRpnt); | 1372 | scsi_print_req_sense("sg_cmd_done", SRpnt); |
1372 | 1373 | ||
1373 | /* Following if statement is a patch supplied by Eric Youngdale */ | 1374 | /* Following if statement is a patch supplied by Eric Youngdale */ |
1374 | if (driver_byte(SRpnt->sr_result) != 0 | 1375 | if (driver_byte(SRpnt->sr_result) != 0 |