[brcm63xx] refresh kernel patches

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

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index f15517b..51a12a1 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -66,10 +66,12 @@ define KernelPackage/capi
   KCONFIG:= \
        CONFIG_ISDN \
        CONFIG_ISDN_CAPI \
-       CONFIG_ISDN_CAPI_CAPI20
+       CONFIG_ISDN_CAPI_CAPI20 \
+       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/capi.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
 endef
 
@@ -240,6 +242,15 @@ $(eval $(call KernelPackage,ipv6))
 define KernelPackage/sit
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   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
   FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
@@ -685,7 +696,7 @@ define KernelPackage/b44
   TITLE:=Broadcom 44xx driver
   FILES:=$(LINUX_DIR)/drivers/net/b44.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_B44
-  DEPENDS:=@TARGET_x86
+  DEPENDS:=@TARGET_x86 @BROKEN
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   AUTOLOAD:=$(call AutoLoad,50,b44)
 endef