pipe: stop using ->can_merge

[sfrench/cifs-2.6.git] / kernel / relay.c

diff --git a/kernel/relay.c b/kernel/relay.c
index 04f248644e065f601d78744be2bbe580a6aa1810..db3e419c25a6ff6f78c1c28e7af0d89d8412f5cf 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1175,7 +1175,6 @@ static void relay_pipe_buf_release(struct pipe_inode_info *pipe,
 }
 
 static const struct pipe_buf_operations relay_pipe_buf_ops = {
-       .can_merge = 0,
        .confirm = generic_pipe_buf_confirm,
        .release = relay_pipe_buf_release,
        .steal = generic_pipe_buf_steal,