From: Matthew Wilcox <matthew@wil.cx>
Date: Sat, 17 Dec 2005 04:11:37 +0000 (-0700)
Subject: [SCSI] Missing const in sr_vendor
X-Git-Tag: v2.6.16-rc1~474^2~22^2~8^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7b32b8e018d8f8cc94c808a5fa84a3f889441b91;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
index 78274dc91f5..9dde8df2f5c 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;