aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/configs
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-08-26 17:02:43 -0400
committerTony Luck <tony.luck@intel.com>2011-08-26 17:02:43 -0400
commit1b60e77d8485841cf6278963b151a486fbae1445 (patch)
treeed2ec07c092d5cf4804af6766fae2965ca9f6c65 /arch/ia64/configs
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')
-rw-r--r--arch/ia64/configs/generic_defconfig1
-rw-r--r--arch/ia64/configs/gensparse_defconfig1
-rw-r--r--arch/ia64/configs/tiger_defconfig1
-rw-r--r--arch/ia64/configs/xen_domu_defconfig1
-rw-r--r--arch/ia64/configs/zx1_defconfig1
5 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig
index 1d7bca0a396..e9077c53320 100644
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -87,6 +87,7 @@ CONFIG_NET_ETHERNET=y
87CONFIG_NET_TULIP=y 87CONFIG_NET_TULIP=y
88CONFIG_TULIP=m 88CONFIG_TULIP=m
89CONFIG_NET_PCI=y 89CONFIG_NET_PCI=y
90CONFIG_NET_VENDOR_INTEL=y
90CONFIG_E100=m 91CONFIG_E100=m
91CONFIG_E1000=y 92CONFIG_E1000=y
92CONFIG_IGB=y 93CONFIG_IGB=y
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig
index b11fa880e4b..91c41ecfa6d 100644
--- a/arch/ia64/configs/gensparse_defconfig
+++ b/arch/ia64/configs/gensparse_defconfig
@@ -75,6 +75,7 @@ CONFIG_NET_ETHERNET=y
75CONFIG_NET_TULIP=y 75CONFIG_NET_TULIP=y
76CONFIG_TULIP=m 76CONFIG_TULIP=m
77CONFIG_NET_PCI=y 77CONFIG_NET_PCI=y
78CONFIG_NET_VENDOR_INTEL=y
78CONFIG_E100=m 79CONFIG_E100=m
79CONFIG_E1000=y 80CONFIG_E1000=y
80CONFIG_TIGON3=y 81CONFIG_TIGON3=y
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index 137a453dd50..a5a9e02e60a 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -77,6 +77,7 @@ CONFIG_NET_ETHERNET=y
77CONFIG_NET_TULIP=y 77CONFIG_NET_TULIP=y
78CONFIG_TULIP=m 78CONFIG_TULIP=m
79CONFIG_NET_PCI=y 79CONFIG_NET_PCI=y
80CONFIG_NET_VENDOR_INTEL=y
80CONFIG_E100=m 81CONFIG_E100=m
81CONFIG_E1000=y 82CONFIG_E1000=y
82CONFIG_TIGON3=y 83CONFIG_TIGON3=y
diff --git a/arch/ia64/configs/xen_domu_defconfig b/arch/ia64/configs/xen_domu_defconfig
index 2bf76e418bc..37b9b422caa 100644
--- a/arch/ia64/configs/xen_domu_defconfig
+++ b/arch/ia64/configs/xen_domu_defconfig
@@ -80,6 +80,7 @@ CONFIG_NET_ETHERNET=y
80CONFIG_NET_TULIP=y 80CONFIG_NET_TULIP=y
81CONFIG_TULIP=m 81CONFIG_TULIP=m
82CONFIG_NET_PCI=y 82CONFIG_NET_PCI=y
83CONFIG_NET_VENDOR_INTEL=y
83CONFIG_E100=m 84CONFIG_E100=m
84CONFIG_E1000=y 85CONFIG_E1000=y
85CONFIG_TIGON3=y 86CONFIG_TIGON3=y
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
57CONFIG_TULIP_NAPI=y 57CONFIG_TULIP_NAPI=y
58CONFIG_TULIP_NAPI_HW_MITIGATION=y 58CONFIG_TULIP_NAPI_HW_MITIGATION=y
59CONFIG_NET_PCI=y 59CONFIG_NET_PCI=y
60CONFIG_NET_VENDOR_INTEL=y
60CONFIG_E100=y 61CONFIG_E100=y
61CONFIG_E1000=y 62CONFIG_E1000=y
62CONFIG_TIGON3=y 63CONFIG_TIGON3=y