From bb6c04e0181d3b08d9d177768f71b896c1aa2d09 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Jan 2009 17:24:31 +0000
Subject: fix kmod-sit dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14222 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules/netsupport.mk | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'package')

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index add802479..73c8b0252 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -276,21 +276,12 @@ endef
 $(eval $(call KernelPackage,ipv6))
 
 
+# sit is not selectable on 2.4, but built when ipv6 is enabled
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
-  DEPENDS:=+kmod-iptunnel4
+  DEPENDS:=+kmod-ipv6 +LINUX_2_6:kmod-iptunnel4
   TITLE:=IPv6-in-IPv4 tunnelling
-endef
-
-# sit is compiled in the 2.4 ipv6 stack
-define KernelPackage/sit/2.4
-  DEPENDS:= @LINUX_2_4 +kmod-ipv6
-  KCONFIG:=CONFIG_IPV6
-endef
-
-define KernelPackage/sit/2.6
-  DEPENDS:= @LINUX_2_6 +kmod-ipv6 +kmod-iptunnel4
-  KCONFIG+=CONFIG_IPV6_SIT
+  KCONFIG:=CONFIG_IPV6 CONFIG_IPV6_SIT
   FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,32,sit)
 endef
-- 
cgit v1.2.3