From 84c774d0f83aa7a846eccfeb74ba10c4e1d421fd Mon Sep 17 00:00:00 2001
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed, 7 Oct 2009 14:45:58 -0700
Subject: [PATCH] --- yaml --- r: 170479 b: refs/heads/master c:
 4b17d50f9e9034be3fe0414dc3492c0071dba75c h: refs/heads/master i:   170477:
 2ca4c44fc1e2ee6d397d9f318f8d6b1fc1fc687f   170475:
 566526babaf4b1e15236e28d5cfd2a635248c2a1   170471:
 445749a9f3f8d8a52f8bab93c9964339fe47dd02   170463:
 ec8b3ba88f2934fdba56810cf9166f74d49a167d v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/cipso_ipv4.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;