Merge branch 'master' into for-2.6.33

This commit is contained in:
Jens Axboe 2009-10-05 09:30:10 +02:00
commit 5d13379a4d
561 changed files with 19032 additions and 15261 deletions

View file

@ -437,7 +437,7 @@ out:
return err;
}
static struct file_operations cciss_proc_fops = {
static const struct file_operations cciss_proc_fops = {
.owner = THIS_MODULE,
.open = cciss_seq_open,
.read = seq_read,