Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[deliverable/linux.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index 2b92e8ece85be3074c2cb63f2588a1f311b95ae7..75a3a9a7efc215bc71ff80e61fff1441a9070b03 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1013,7 +1013,7 @@ static ssize_t relay_file_sendfile(struct file *filp,
                                       actor, &desc);
 }
 
-struct file_operations relay_file_operations = {
+const struct file_operations relay_file_operations = {
        .open           = relay_file_open,
        .poll           = relay_file_poll,
        .mmap           = relay_file_mmap,