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
owl
Jo-Philipp Wich 2015-01-29 19:15:45 +00:00
parent 44eecf6392
commit fefba5d685
2 changed files with 2 additions and 15 deletions

View File

@ -144,24 +144,13 @@ endef
$(eval $(call KernelPackage,8021q)) $(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 define KernelPackage/vxlan
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Native VXLAN Kernel support TITLE:=Native VXLAN Kernel support
DEPENDS:=+kmod-iptunnel +IPV6:kmod-udptunnel6 DEPENDS:=+kmod-iptunnel
KCONFIG:=CONFIG_VXLAN KCONFIG:=CONFIG_VXLAN
FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
AUTOLOAD:=$(call AutoLoad,33,vxlan) AUTOLOAD:=$(call AutoLoad,13,vxlan)
endef endef
define KernelPackage/vxlan/description define KernelPackage/vxlan/description

View File

@ -345,8 +345,6 @@ CONFIG_PARAVIRT_CLOCK=y
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
# CONFIG_PC87413_WDT is not set # CONFIG_PC87413_WDT is not set
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCIEAER=y
CONFIG_PCIEPORTBUS=y
CONFIG_PCI_DIRECT=y CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS=y
# CONFIG_PCI_IOAPIC is not set # CONFIG_PCI_IOAPIC is not set