aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-01-29 19:15:45 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-01-29 19:15:45 +0000
commitfefba5d685ad94cdfc328d4db8f97df13e669102 (patch)
tree9599a9657e3e419ab6f99b6647768fc1862a3241 /package/kernel
parent44eecf6392ed834e8da11ca3d5ac76620dffb0f2 (diff)
downloadupstream-fefba5d685ad94cdfc328d4db8f97df13e669102.tar.gz
upstream-fefba5d685ad94cdfc328d4db8f97df13e669102.tar.bz2
upstream-fefba5d685ad94cdfc328d4db8f97df13e669102.zip
Revert "x86_64: enable PCIE support"
This reverts commit daadd4320c4eadce3937e8ca13ede0ce1b97e125 which erroneously introduced unrelated changes. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 44202
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/linux/modules/netsupport.mk15
1 files changed, 2 insertions, 13 deletions
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index a3abf0da08..badd54231b 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -144,24 +144,13 @@ endef
$(eval $(call KernelPackage,8021q))
-define KernelPackage/udptunnel6
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=UDP tunneling support
- DEPENDS:=@!(LINUX_3_8||LINUX_3_10||LINUX_3_13||LINUX_3_14) +kmod-ipv6
- KCONFIG:=CONFIG_NET_UDP_TUNNEL
- FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko
- AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel)
-endef
-
-$(eval $(call KernelPackage,udptunnel6))
-
define KernelPackage/vxlan
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Native VXLAN Kernel support
- DEPENDS:=+kmod-iptunnel +IPV6:kmod-udptunnel6
+ DEPENDS:=+kmod-iptunnel
KCONFIG:=CONFIG_VXLAN
FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
- AUTOLOAD:=$(call AutoLoad,33,vxlan)
+ AUTOLOAD:=$(call AutoLoad,13,vxlan)
endef
define KernelPackage/vxlan/description