From f6c7b51b0143791b392ffe377b352ba0dc76bd88 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 7 Dec 2006 01:17:24 -0800
Subject: [PATCH] --- yaml --- r: 43195 b: refs/heads/master c:
 272491ef423b6976a230a998b10f46976aa91342 h: refs/heads/master i:   43193:
 64411b182bce31a29a52fd4632dc5157e7e9b3cc   43191:
 6721553e5452c9bd52b8ede5cef21ab4b072d5ab v: v3

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

diff --git a/[refs] b/[refs]
index 249e67829dc4..e7bc1e8056a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb45d21fb2fcbcafc19ea859350f564252a0878
+refs/heads/master: 272491ef423b6976a230a998b10f46976aa91342
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
index eaa0f8a1adb6..9b3158ce46e1 100644
--- a/trunk/net/netfilter/nf_conntrack_core.c
+++ b/trunk/net/netfilter/nf_conntrack_core.c
@@ -1093,7 +1093,7 @@ static void free_conntrack_hash(struct list_head *hash, int vmalloced, int size)
 			   get_order(sizeof(struct list_head) * size));
 }
 
-void nf_conntrack_flush()
+void nf_conntrack_flush(void)
 {
 	nf_ct_iterate_cleanup(kill_all, NULL);
 }