aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2005-12-16 21:11:37 -0700
committerJames Bottomley <jejb@mulgrave.(none)>2005-12-17 10:50:23 -0600
commit7b32b8e018d8f8cc94c808a5fa84a3f889441b91 (patch)
treeafe4f0d68258bd7beac1ad3f3f1c09ba195bf096
parent[SCSI] Merge sym53c8xx_comm.h and sym53c8xx_defs.h into ncr driver (diff)
downloadlinux-dev-7b32b8e018d8f8cc94c808a5fa84a3f889441b91.tar.xz
linux-dev-7b32b8e018d8f8cc94c808a5fa84a3f889441b91.zip
[SCSI] Missing const in sr_vendor
Fix compile warnings with current scsi-misc git tree Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/sr_vendor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
index 78274dc91f5c..9dde8df2f5c9 100644
--- a/drivers/scsi/sr_vendor.c
+++ b/drivers/scsi/sr_vendor.c
@@ -68,8 +68,8 @@ void sr_vendor_init(Scsi_CD *cd)
#ifndef CONFIG_BLK_DEV_SR_VENDOR
cd->vendor = VENDOR_SCSI3;
#else
- char *vendor = cd->device->vendor;
- char *model = cd->device->model;
+ const char *vendor = cd->device->vendor;
+ const char *model = cd->device->model;
/* default */
cd->vendor = VENDOR_SCSI3;