[etrax] Update and add patches

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

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 25900a5..73c8b02 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -71,7 +71,7 @@ define KernelPackage/capi
        $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX)
        $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi capifs)

 endef
 
 define KernelPackage/capi/description
 endef
 
 define KernelPackage/capi/description


@@ -80,14 +80,48 @@ endef
 
 $(eval $(call KernelPackage,capi))
 
 
 $(eval $(call KernelPackage,capi))
 

+define KernelPackage/misdn
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=mISDN (ISDN) Support
+  KCONFIG:= \
+       CONFIG_ISDN=y \
+       CONFIG_MISDN \
+       CONFIG_MISDN_DSP \
+       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) \
+       $(LINUX_DIR)/drivers/isdn/mISDN/l1oip.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,mISDN_core mISDN_dsp l1oip)
+endef
+
+define KernelPackage/misdn/description
+  Modular ISDN driver support
+endef
+
+$(eval $(call KernelPackage,misdn))
+

 
 define KernelPackage/ipip
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IP-in-IP encapsulation
 
 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)
   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
 endef
 
 define KernelPackage/ipip/description


@@ -187,7 +221,7 @@ $(eval $(call KernelPackage,ipsec6))
 define KernelPackage/iptunnel4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv4 tunneling
 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
   KCONFIG:= \
        CONFIG_NET_IPIP \
        CONFIG_INET_TUNNEL


@@ -242,21 +276,12 @@ endef
 $(eval $(call KernelPackage,ipv6))
 
 
 $(eval $(call KernelPackage,ipv6))
 
 

+# sit is not selectable on 2.4, but built when ipv6 is enabled

 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)

-  DEPENDS:=+kmod-iptunnel4
+  DEPENDS:=+kmod-ipv6 +LINUX_2_6:kmod-iptunnel4

   TITLE:=IPv6-in-IPv4 tunnelling
   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
   FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,32,sit)
 endef