diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 14:25:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-18 14:25:40 -0700 |
| commit | 0b2cad2f30d0353f2576b1a2207c0792ba713157 (patch) | |
| tree | 0d7f73fcc961111ddca915cc8f267ebb088a04c2 /drivers/scsi/sg.c | |
| parent | 238628edb6cd427454fb54994e2605e191bfc26a (diff) | |
| parent | 686579d95d48c713bdb7008cc76af8398219e687 (diff) | |
| download | linux-3.10-0b2cad2f30d0353f2576b1a2207c0792ba713157.tar.gz linux-3.10-0b2cad2f30d0353f2576b1a2207c0792ba713157.tar.bz2 linux-3.10-0b2cad2f30d0353f2576b1a2207c0792ba713157.zip | |
Merge SCSI tree from James Bottomley.
Done with "git-pull-script rsync://www.parisc-linux.org/~jejb/scsi-rc-fixes-2.6.git"
together with an automated content merge.
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 fd72d73bb24..cf6b1f0fb12 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -51,6 +51,7 @@ static int sg_version_num = 30532; /* 2 digits for each component */ #include <linux/delay.h> #include "scsi.h" +#include <scsi/scsi_dbg.h> #include <scsi/scsi_host.h> #include <scsi/scsi_driver.h> #include <scsi/scsi_ioctl.h> @@ -1311,7 +1312,7 @@ sg_cmd_done(Scsi_Cmnd * SCpnt) if ((sdp->sgdebug > 0) && ((CHECK_CONDITION == srp->header.masked_status) || (COMMAND_TERMINATED == srp->header.masked_status))) - print_req_sense("sg_cmd_done", SRpnt); + scsi_print_req_sense("sg_cmd_done", SRpnt); /* Following if statement is a patch supplied by Eric Youngdale */ if (driver_byte(SRpnt->sr_result) != 0 |