diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 03:30:10 -0400 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/block | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/cciss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 78852b103198..fb5be2d95d52 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
| @@ -437,7 +437,7 @@ out: | |||
| 437 | return err; | 437 | return err; |
| 438 | } | 438 | } |
| 439 | 439 | ||
| 440 | static struct file_operations cciss_proc_fops = { | 440 | static const struct file_operations cciss_proc_fops = { |
| 441 | .owner = THIS_MODULE, | 441 | .owner = THIS_MODULE, |
| 442 | .open = cciss_seq_open, | 442 | .open = cciss_seq_open, |
| 443 | .read = seq_read, | 443 | .read = seq_read, |