Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b60e77d authored Aug 26, 2011 by Tony Luck

[IA64[ add CONFIG_NET_VENDOR_INTEL=y to default config files where needed



Jeff Kirsher's reorganization of network drivers means that we need
to choose CONFIG_NET_VENDOR_INTEL before options like CONFIG_E100
and CONFIG_E1000 become visible. Fix the minimized ia64 config
files so that we continue to have network drivers in the kernels
that they build.

Signed-off-by: Tony Luck <tony.luck@intel.com>

parent fc000154

arch/ia64/configs/generic_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -87,6 +87,7 @@ CONFIG_NET_ETHERNET=y
	CONFIG_NET_TULIP=y		CONFIG_NET_TULIP=y
	CONFIG_TULIP=m		CONFIG_TULIP=m
	CONFIG_NET_PCI=y		CONFIG_NET_PCI=y
			CONFIG_NET_VENDOR_INTEL=y
	CONFIG_E100=m		CONFIG_E100=m
	CONFIG_E1000=y		CONFIG_E1000=y
	CONFIG_IGB=y		CONFIG_IGB=y

arch/ia64/configs/gensparse_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,7 @@ CONFIG_NET_ETHERNET=y
	CONFIG_NET_TULIP=y		CONFIG_NET_TULIP=y
	CONFIG_TULIP=m		CONFIG_TULIP=m
	CONFIG_NET_PCI=y		CONFIG_NET_PCI=y
			CONFIG_NET_VENDOR_INTEL=y
	CONFIG_E100=m		CONFIG_E100=m
	CONFIG_E1000=y		CONFIG_E1000=y
	CONFIG_TIGON3=y		CONFIG_TIGON3=y

arch/ia64/configs/tiger_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,7 @@ CONFIG_NET_ETHERNET=y
	CONFIG_NET_TULIP=y		CONFIG_NET_TULIP=y
	CONFIG_TULIP=m		CONFIG_TULIP=m
	CONFIG_NET_PCI=y		CONFIG_NET_PCI=y
			CONFIG_NET_VENDOR_INTEL=y
	CONFIG_E100=m		CONFIG_E100=m
	CONFIG_E1000=y		CONFIG_E1000=y
	CONFIG_TIGON3=y		CONFIG_TIGON3=y

arch/ia64/configs/xen_domu_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -80,6 +80,7 @@ CONFIG_NET_ETHERNET=y
	CONFIG_NET_TULIP=y		CONFIG_NET_TULIP=y
	CONFIG_TULIP=m		CONFIG_TULIP=m
	CONFIG_NET_PCI=y		CONFIG_NET_PCI=y
			CONFIG_NET_VENDOR_INTEL=y
	CONFIG_E100=m		CONFIG_E100=m
	CONFIG_E1000=y		CONFIG_E1000=y
	CONFIG_TIGON3=y		CONFIG_TIGON3=y

arch/ia64/configs/zx1_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,7 @@ CONFIG_TULIP_MMIO=y
	CONFIG_TULIP_NAPI=y		CONFIG_TULIP_NAPI=y
	CONFIG_TULIP_NAPI_HW_MITIGATION=y		CONFIG_TULIP_NAPI_HW_MITIGATION=y
	CONFIG_NET_PCI=y		CONFIG_NET_PCI=y
			CONFIG_NET_VENDOR_INTEL=y
	CONFIG_E100=y		CONFIG_E100=y
	CONFIG_E1000=y		CONFIG_E1000=y
	CONFIG_TIGON3=y		CONFIG_TIGON3=y