X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4dbfa86fb54570f1e5e30d1ec0cc57f550fe990c..87ba46edf35c7f1690ff6648574b3c92b25743fd:/package/kernel/modules/netsupport.mk

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 4e75a9c27..73c8b0252 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -87,7 +87,20 @@ define KernelPackage/misdn
   	CONFIG_ISDN=y \
   	CONFIG_MISDN \
 	CONFIG_MISDN_DSP \
-	CONFIG_MISDN_L1OIP
+	CONFIG_MISDN_L1OIP \
+	CONFIG_ISDN_PPP=N \
+	CONFIG_ISDN_AUDIO=n \
+	CONFIG_ISDN_WITH_ABC=n \
+	CONFIG_ISDN_DRV_LOOP=n \
+	CONFIG_ISDN_DIVERSION=n \
+	CONFIG_ISDN_DRV_HISAX=n \
+	CONFIG_ISDN_DRV_ICN=n \
+	CONFIG_ISDN_DRV_PCBIT=n \
+	CONFIG_ISDN_DRV_SC=n \
+	CONFIG_ISDN_DRV_ACT2000=n \
+	CONFIG_ISDN_DRV_EICON=n \
+	CONFIG_ISDN_DRV_TPAM=n \
+	CONFIG_HYSDN=n
   FILES:= \
   	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.$(LINUX_KMOD_SUFFIX) \
@@ -105,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
@@ -208,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
@@ -263,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