[package] add cp852 code page (#4607)

[openwrt.git] / package / kernel / modules / netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 70e239c..73c8b02 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -118,10 +118,10 @@ $(eval $(call KernelPackage,misdn))
 define KernelPackage/ipip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP-in-IP encapsulation
-  DEPENDS:=+kmod-iptunnel4
+  DEPENDS:=+LINUX_2_6:kmod-iptunnel4
   KCONFIG:=CONFIG_NET_IPIP
   FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,ipip)
+  AUTOLOAD:=$(call AutoLoad,32,ipip)
 endef
 
 define KernelPackage/ipip/description
@@ -221,7 +221,7 @@ $(eval $(call KernelPackage,ipsec6))
 define KernelPackage/iptunnel4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv4 tunneling
-  DEPENDS:= @LINUX_2_6
+  DEPENDS:=@LINUX_2_6
   KCONFIG:= \
        CONFIG_NET_IPIP \
        CONFIG_INET_TUNNEL
@@ -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