Merge branch 'for-4.2-misc' into k.o/for-4.2

[cascardo/linux.git] / net / rds / rds.h

diff --git a/net/rds/rds.h b/net/rds/rds.h
index d2c6009..cc54985 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -577,7 +577,6 @@ struct rds_statistics {
 };
 
 /* af_rds.c */
-char *rds_str_array(char **array, size_t elements, size_t index);
 void rds_sock_addref(struct rds_sock *rs);
 void rds_sock_put(struct rds_sock *rs);
 void rds_wake_sk_sleep(struct rds_sock *rs);