diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-25 19:51:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-05-25 19:51:40 +0000 |
| commit | 7967debb9c75a5c434f23d703bca31c48c2a1f69 (patch) | |
| tree | 05fb7fc67febf88a128c92606ca34191df78356a /package/kernel/modules/netsupport.mk | |
| parent | 22ca381be85d5c1089c61d05bc850f85ffce0e7a (diff) | |
| download | upstream-7967debb9c75a5c434f23d703bca31c48c2a1f69.tar.gz upstream-7967debb9c75a5c434f23d703bca31c48c2a1f69.tar.bz2 upstream-7967debb9c75a5c434f23d703bca31c48c2a1f69.zip | |
kernel: generic: Update 2.6.39 to final
* Add missing config symbols
* Update package/kernel for 2.6.39
CONFIG_BT_L2CAP=y and CONFIG_BT_SCO=y are set to build them into the bluetooth module.
Thank you Jonas Gorski for the patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27010 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/netsupport.mk')
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index a1518156fa..7387319731 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -477,7 +477,7 @@ $(eval $(call KernelPackage,pppoa)) define KernelPackage/pptp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPtP support - DEPENDS:=kmod-ppp +kmod-gre @LINUX_2_6_37||LINUX_2_6_38 + DEPENDS:=kmod-ppp +kmod-gre @LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39 KCONFIG:=CONFIG_PPTP FILES:=$(LINUX_DIR)/drivers/net/pptp.ko AUTOLOAD:=$(call AutoLoad,41,pptp) @@ -489,9 +489,9 @@ $(eval $(call KernelPackage,pptp)) define KernelPackage/pppol2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPPoL2TP support - DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38:kmod-l2tp + DEPENDS:=kmod-ppp +kmod-pppoe +LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39:kmod-l2tp KCONFIG:=CONFIG_PPPOL2TP - ifneq ($(CONFIG_LINUX_2_6_35)$(CONFIG_LINUX_2_6_36)$(CONFIG_LINUX_2_6_37)$(CONFIG_LINUX_2_6_38),) + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ppp.ko AUTOLOAD:=$(call AutoLoad,40,l2tp_ppp) else @@ -652,7 +652,7 @@ $(eval $(call KernelPackage,pktgen)) define KernelPackage/l2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) - DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38 + DEPENDS:=@LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37||LINUX_2_6_38||LINUX_2_6_39 TITLE:=Layer Two Tunneling Protocol (L2TP) KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ |