Author: jow Date: 2015-01-29 20:15:45 +0100 (Thu, 29 Jan 2015) New Revision: 44202
Modified: trunk/package/kernel/linux/modules/netsupport.mk trunk/target/linux/x86_64/config-default Log: Revert "x86_64: enable PCIE support" This reverts commit daadd4320c4eadce3937e8ca13ede0ce1b97e125 which erroneously introduced unrelated changes. Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/package/kernel/linux/modules/netsupport.mk =================================================================== --- trunk/package/kernel/linux/modules/netsupport.mk 2015-01-29 19:12:29 UTC (rev 44201) +++ trunk/package/kernel/linux/modules/netsupport.mk 2015-01-29 19:15:45 UTC (rev 44202) @@ -144,24 +144,13 @@ $(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 Modified: trunk/target/linux/x86_64/config-default =================================================================== --- trunk/target/linux/x86_64/config-default 2015-01-29 19:12:29 UTC (rev 44201) +++ trunk/target/linux/x86_64/config-default 2015-01-29 19:15:45 UTC (rev 44202) @@ -345,8 +345,6 @@ # 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
