diff --git a/[refs] b/[refs]
index 5abe36bab016..7052c333268d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e8342971d44ce86d8567047f5366fc1c06a75ed
+refs/heads/master: 4b17d50f9e9034be3fe0414dc3492c0071dba75c
diff --git a/trunk/net/ipv4/cipso_ipv4.c b/trunk/net/ipv4/cipso_ipv4.c
index 039cc1ffe977..1e029dc75455 100644
--- a/trunk/net/ipv4/cipso_ipv4.c
+++ b/trunk/net/ipv4/cipso_ipv4.c
@@ -2017,7 +2017,7 @@ int cipso_v4_req_setattr(struct request_sock *req,
  * values on failure.
  *
  */
-int cipso_v4_delopt(struct ip_options **opt_ptr)
+static int cipso_v4_delopt(struct ip_options **opt_ptr)
 {
 	int hdr_delta = 0;
 	struct ip_options *opt = *opt_ptr;