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/ch.c | |
| parent | d347da0deffa1d8f88f0d270eab040e4707c9916 (diff) | |
| parent | 7b32b8e018d8f8cc94c808a5fa84a3f889441b91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/scsi/ch.c')
| -rw-r--r-- | drivers/scsi/ch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index ccbbae2bf47..0920220f331 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c @@ -75,7 +75,7 @@ static int vendor_counts[CH_TYPES-4]; module_param_array(vendor_firsts, int, NULL, 0444); module_param_array(vendor_counts, int, NULL, 0444); -static char *vendor_labels[CH_TYPES-4] = { +static const char * vendor_labels[CH_TYPES-4] = { "v0", "v1", "v2", "v3" }; // module_param_string_array(vendor_labels, NULL, 0444); @@ -140,7 +140,7 @@ static struct file_operations changer_fops = #endif }; -static struct { +static const struct { unsigned char sense; unsigned char asc; unsigned char ascq; |