aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/configs/zx1_defconfig
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-08-26 14:02:43 -0700
committerTony Luck <tony.luck@intel.com>2011-08-26 14:02:43 -0700
commit1b60e77d8485841cf6278963b151a486fbae1445 (patch)
treeed2ec07c092d5cf4804af6766fae2965ca9f6c65 /arch/ia64/configs/zx1_defconfig
parentfc000154d7a63dee209aab1c13f2c19abdcf6b59 (diff)
[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>
Diffstat (limited to 'arch/ia64/configs/zx1_defconfig')
-rw-r--r--arch/ia64/configs/zx1_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 1d42827f9fa..fc7aba07c2b 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -57,6 +57,7 @@ CONFIG_TULIP_MMIO=y
CONFIG_TULIP_NAPI=y
CONFIG_TULIP_NAPI_HW_MITIGATION=y
CONFIG_NET_PCI=y
+CONFIG_NET_VENDOR_INTEL=y
CONFIG_E100=y
CONFIG_E1000=y
CONFIG_TIGON3=y