diff options
| author |   Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/block | |
| parent | block: CFQ is more than a desktop scheduler (diff) | |
| parent | Linux 2.6.32-rc3 (diff) | |
| download | linux-dev-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.xz linux-dev-5d13379a4dba717fb75b749acc0f928c2c02db17.zip | |
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: 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, |