summaryrefslogtreecommitdiffstats
path: root/block/blk-integrity.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 08:17:32 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 08:17:32 +0100
commitce67eef6a112bb283c6db39f9195800f31f5599a (patch)
tree34f2e7fbd0b9838abba482dbb1a7db09e6fbb53c /block/blk-integrity.c
parentInput: wacom - merge out and in prox events (diff)
parentLinux 2.6.34-rc1 (diff)
downloadlinux-ce67eef6a112bb283c6db39f9195800f31f5599a.tar.xz
linux-ce67eef6a112bb283c6db39f9195800f31f5599a.zip
Merge commit 'v2.6.34-rc1' into for-linus
Diffstat (limited to 'block/blk-integrity.c')
-rw-r--r--block/blk-integrity.c2
1 files changed, 1 insertions, 1 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,
};