diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 11:59:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-03 11:59:27 -0800 |
commit | 3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6 (patch) | |
tree | 949e577cdb14a51de5075505502ed30d277f5c50 /drivers/scsi/scsi_lib.c | |
parent | b8c9a18712f7b617fda66d878ce3759c9e575ba0 (diff) | |
parent | 751bf4d7865e4ced406be93b04c7436d866d3684 (diff) | |
download | op-kernel-dev-3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6.zip op-kernel-dev-3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] scsi_sysfs: restore prep_fn when ULD is removed
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 8df8267..60f77c4 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1346,7 +1346,7 @@ int scsi_prep_return(struct request_queue *q, struct request *req, int ret) } EXPORT_SYMBOL(scsi_prep_return); -static int scsi_prep_fn(struct request_queue *q, struct request *req) +int scsi_prep_fn(struct request_queue *q, struct request *req) { struct scsi_device *sdev = q->queuedata; int ret = BLKPREP_KILL; |