diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /drivers/scsi/osst.c | |
parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'drivers/scsi/osst.c')
-rw-r--r-- | drivers/scsi/osst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index bd6bbf61adb8..9668b73872c7 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
@@ -5522,7 +5522,7 @@ __setup("osst=", osst_setup); | |||
5522 | 5522 | ||
5523 | #endif | 5523 | #endif |
5524 | 5524 | ||
5525 | static struct file_operations osst_fops = { | 5525 | static const struct file_operations osst_fops = { |
5526 | .owner = THIS_MODULE, | 5526 | .owner = THIS_MODULE, |
5527 | .read = osst_read, | 5527 | .read = osst_read, |
5528 | .write = osst_write, | 5528 | .write = osst_write, |