Merge branches 'pm-cpuidle' and 'pm-sleep'

[linux-2.6-microblaze.git] / net / smc / smc_rx.c

diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
index bbcf0fe..413a6ab 100644 (file)
--- a/net/smc/smc_rx.c
+++ b/net/smc/smc_rx.c
@@ -136,7 +136,6 @@ static int smc_rx_pipe_buf_nosteal(struct pipe_inode_info *pipe,
 }
 
 static const struct pipe_buf_operations smc_pipe_ops = {
-       .can_merge = 0,
        .confirm = generic_pipe_buf_confirm,
        .release = smc_rx_pipe_buf_release,
        .steal = smc_rx_pipe_buf_nosteal,