diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:30:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:30:12 -0800 |
| commit | f61ea1b0c825a20a1826bb43a226387091934586 (patch) | |
| tree | fdedf0a2368f707e3fd5205db05bfcbac79606ec /drivers/scsi/scsi_priv.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [SCSI] Missing const in sr_vendor (diff) | |
| download | linux-dev-f61ea1b0c825a20a1826bb43a226387091934586.tar.xz linux-dev-f61ea1b0c825a20a1826bb43a226387091934586.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/scsi/scsi_priv.h')
| -rw-r--r-- | drivers/scsi/scsi_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index d632d9e1493c..f04e7e11f57a 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h @@ -40,7 +40,6 @@ extern void scsi_exit_hosts(void); extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd); extern int scsi_setup_command_freelist(struct Scsi_Host *shost); extern void scsi_destroy_command_freelist(struct Scsi_Host *shost); -extern int scsi_insert_special_req(struct scsi_request *sreq, int); extern void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq); extern void __scsi_release_request(struct scsi_request *sreq); @@ -57,7 +56,8 @@ static inline void scsi_log_completion(struct scsi_cmnd *cmd, int disposition) /* scsi_devinfo.c */ extern int scsi_get_device_flags(struct scsi_device *sdev, - unsigned char *vendor, unsigned char *model); + const unsigned char *vendor, + const unsigned char *model); extern int __init scsi_init_devinfo(void); extern void scsi_exit_devinfo(void); |