From 520e3d923a5689e3c0a3702406971a6f89726199 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 15 Sep 2011 21:00:22 +0200
Subject: Invert the logic to include version.h in ip_set_core.c

---
 kernel/net/netfilter/ipset/Kbuild        | 2 +-
 kernel/net/netfilter/ipset/ip_set_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kernel')

diff --git a/kernel/net/netfilter/ipset/Kbuild b/kernel/net/netfilter/ipset/Kbuild
index 390ec1e..a04bb64 100644
--- a/kernel/net/netfilter/ipset/Kbuild
+++ b/kernel/net/netfilter/ipset/Kbuild
@@ -1,5 +1,5 @@
 NOSTDINC_FLAGS += -I$(KDIR)/include
-EXTRA_CFLAGS := -DCONFIG_IP_SET_MAX=$(IP_SET_MAX) -DIPSET_EXTERNAL_MODULE
+EXTRA_CFLAGS := -DCONFIG_IP_SET_MAX=$(IP_SET_MAX)
 
 ip_set-y := ip_set_core.o ip_set_getport.o pfxlen.o
 obj-m += ip_set.o
diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index 0fe43a1..c980329 100644
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -17,7 +17,7 @@
 #include <linux/spinlock.h>
 #include <linux/netlink.h>
 #include <linux/rculist.h>
-#ifdef IPSET_EXTERNAL_MODULE
+#ifndef IPSET_IN_KERNEL_TREE
 #include <linux/version.h>
 #endif
 #include <net/netlink.h>
-- 
cgit v1.2.3