diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-29 17:44:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-29 17:44:06 +1100 |
| commit | 58855a340cd90f4c5f10a167f91b5143a7def646 (patch) | |
| tree | bbfb3cdbd53e77e3667d58a83deb24df3a128349 /block | |
| parent | 9967e0c96da5917bdd817bf7b52378bbd5f7d61e (diff) | |
| parent | 2e0b009f45c710f1877ecca3a38f75ef63881412 (diff) | |
Merge branch 'quilt/driver-core'
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-integrity.c | 2 | ||||
| -rw-r--r-- | block/blk-sysfs.c | 2 | ||||
| -rw-r--r-- | block/elevator.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 15c630813b1c..96e83c2bdb94 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs[] = { NULL, }; -static struct sysfs_ops integrity_ops = { +static const struct sysfs_ops integrity_ops = { .show = &integrity_attr_show, .store = &integrity_attr_store, }; diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 8606c9543fdd..f44375324884 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -447,7 +447,7 @@ static void blk_release_queue(struct kobject *kobj) kmem_cache_free(blk_requestq_cachep, q); } -static struct sysfs_ops queue_sysfs_ops = { +static const struct sysfs_ops queue_sysfs_ops = { .show = queue_attr_show, .store = queue_attr_store, }; diff --git a/block/elevator.c b/block/elevator.c index 9ad5ccc4c5ee..38e89204f207 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -883,7 +883,7 @@ elv_attr_store(struct kobject *kobj, struct attribute *attr, return error; } -static struct sysfs_ops elv_sysfs_ops = { +static const struct sysfs_ops elv_sysfs_ops = { .show = elv_attr_show, .store = elv_attr_store, }; |