Add the gpio_keys input module to menuconfig

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

diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 4e75a9c..e848037 100644 (file)
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 NETWORK_SUPPORT_MENU:=Network Support
 
@@ -69,9 +68,9 @@ define KernelPackage/capi
        CONFIG_ISDN_CAPIFS
   FILES:= \
        $(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 capifs)
+       $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) \
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
 endef
 
 define KernelPackage/capi/description
@@ -87,7 +86,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) \
@@ -102,13 +114,51 @@ endef
 $(eval $(call KernelPackage,misdn))
 
 
+define KernelPackage/isdn4linux
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=Old ISDN4Linux (deprecated)
+  KCONFIG:= \
+    CONFIG_ISDN=y \
+    CONFIG_ISDN_I4L \
+    CONFIG_ISDN_PPP=y \
+    CONFIG_ISDN_PPP_VJ=y \
+    CONFIG_ISDN_MPP=y \
+    CONFIG_IPPP_FILTER=y \
+    CONFIG_ISDN_PPP_BSDCOMP \
+    CONFIG_ISDN_AUDIO=y \
+    CONFIG_ISDN_TTY_FAX=y \
+    CONFIG_ISDN_X25=y \
+    CONFIG_ISDN_DIVERSION \
+    CONFIG_ISDN_CAPI_CAPIDRV=n \
+    CONFIG_ISDN_DRV_ACT2000=n \
+    CONFIG_ISDN_DRV_GIGASET=n \
+    CONFIG_ISDN_DRV_HISAX=n \
+    CONFIG_ISDN_DRV_ICN=n \
+    CONFIG_ISDN_DRV_LOOP=n \
+    CONFIG_ISDN_DRV_PCBIT=n \
+    CONFIG_ISDN_DRV_SC=n \
+    CONFIG_HYSDN=n
+  FILES:= \
+    $(LINUX_DIR)/drivers/isdn/i4l/isdn.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/drivers/isdn/i4l/isdn_bsdcomp.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert)
+endef
+
+define KernelPackage/isdn4linux/description
+  This driver allows you to use an ISDN adapter for networking
+endef
+
+$(eval $(call KernelPackage,isdn4linux))
+
+
 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 +258,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
@@ -251,6 +301,8 @@ define KernelPackage/ipv6
        CONFIG_IPV6 \
        CONFIG_IPV6_PRIVACY=y \
        CONFIG_IPV6_MULTIPLE_TABLES=y \
+       CONFIG_IPV6_MROUTE=y \
+       CONFIG_IPV6_PIMSM_V2=n \
        CONFIG_IPV6_SUBTREES=y
   FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ipv6)
@@ -263,21 +315,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
@@ -467,7 +510,17 @@ define KernelPackage/sched
        CONFIG_NET_SCH_RED \
        CONFIG_NET_SCH_SFQ \
        CONFIG_NET_SCH_TBF \
-       CONFIG_NET_SCH_TEQL
+       CONFIG_NET_SCH_TEQL \
+       CONFIG_NET_CLS=y \
+       CONFIG_NET_CLS_ACT=y \
+       CONFIG_NET_CLS_BASIC \
+       CONFIG_NET_CLS_FLOW \
+       CONFIG_NET_CLS_FW \
+       CONFIG_NET_CLS_ROUTE4 \
+       CONFIG_NET_CLS_TCINDEX \
+       CONFIG_NET_CLS_U32 \
+       CONFIG_NET_ACT_MIRRED \
+       CONFIG_NET_ACT_IPT
   FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX)
 endef
 
@@ -481,6 +534,7 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
+  DEPENDS:=kmod-crc16
   KCONFIG:= \
        CONFIG_AX25 \
        CONFIG_MKISS