aboutsummaryrefslogtreecommitdiffstats
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
commitdefffd7cd1b144a5eb4841b2ad8dd0fa588194a5 (patch)
tree55cdc7bf5a6f200168967f7551fe3891e0695def
parent293b505f467b9e56be16a5e7f6a5439e74f081b0 (diff)
downloadupstream-defffd7cd1b144a5eb4841b2ad8dd0fa588194a5.tar.gz
upstream-defffd7cd1b144a5eb4841b2ad8dd0fa588194a5.tar.bz2
upstream-defffd7cd1b144a5eb4841b2ad8dd0fa588194a5.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44202 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/linux/modules/netsupport.mk15
-rw-r--r--target/linux/x86_64/config-default2
2 files changed, 2 insertions, 15 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
diff --git a/target/linux/x86_64/config-default b/target/linux/x86_64/config-default
index dbbb3e84e8..dde8b25499 100644
--- a/target/linux/x86_64/config-default
+++ b/target/linux/x86_64/config-default
@@ -345,8 +345,6 @@ CONFIG_PARAVIRT_CLOCK=y
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
# CONFIG_PCI_IOAPIC is not set