diff options
| author | Tony Luck <tony.luck@intel.com> | 2011-08-26 17:02:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-08-26 17:02:43 -0400 |
| commit | 1b60e77d8485841cf6278963b151a486fbae1445 (patch) | |
| tree | ed2ec07c092d5cf4804af6766fae2965ca9f6c65 | |
| parent | fc000154d7a63dee209aab1c13f2c19abdcf6b59 (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>
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/gensparse_defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/tiger_defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/xen_domu_defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/zx1_defconfig | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 1d7bca0a396d..e9077c533205 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig | |||
| @@ -87,6 +87,7 @@ CONFIG_NET_ETHERNET=y | |||
| 87 | CONFIG_NET_TULIP=y | 87 | CONFIG_NET_TULIP=y |
| 88 | CONFIG_TULIP=m | 88 | CONFIG_TULIP=m |
| 89 | CONFIG_NET_PCI=y | 89 | CONFIG_NET_PCI=y |
| 90 | CONFIG_NET_VENDOR_INTEL=y | ||
| 90 | CONFIG_E100=m | 91 | CONFIG_E100=m |
| 91 | CONFIG_E1000=y | 92 | CONFIG_E1000=y |
| 92 | CONFIG_IGB=y | 93 | CONFIG_IGB=y |
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig index b11fa880e4b6..91c41ecfa6d9 100644 --- a/arch/ia64/configs/gensparse_defconfig +++ b/arch/ia64/configs/gensparse_defconfig | |||
| @@ -75,6 +75,7 @@ CONFIG_NET_ETHERNET=y | |||
| 75 | CONFIG_NET_TULIP=y | 75 | CONFIG_NET_TULIP=y |
| 76 | CONFIG_TULIP=m | 76 | CONFIG_TULIP=m |
| 77 | CONFIG_NET_PCI=y | 77 | CONFIG_NET_PCI=y |
| 78 | CONFIG_NET_VENDOR_INTEL=y | ||
| 78 | CONFIG_E100=m | 79 | CONFIG_E100=m |
| 79 | CONFIG_E1000=y | 80 | CONFIG_E1000=y |
| 80 | CONFIG_TIGON3=y | 81 | CONFIG_TIGON3=y |
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 137a453dd508..a5a9e02e60a0 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
| @@ -77,6 +77,7 @@ CONFIG_NET_ETHERNET=y | |||
| 77 | CONFIG_NET_TULIP=y | 77 | CONFIG_NET_TULIP=y |
| 78 | CONFIG_TULIP=m | 78 | CONFIG_TULIP=m |
| 79 | CONFIG_NET_PCI=y | 79 | CONFIG_NET_PCI=y |
| 80 | CONFIG_NET_VENDOR_INTEL=y | ||
| 80 | CONFIG_E100=m | 81 | CONFIG_E100=m |
| 81 | CONFIG_E1000=y | 82 | CONFIG_E1000=y |
| 82 | CONFIG_TIGON3=y | 83 | CONFIG_TIGON3=y |
diff --git a/arch/ia64/configs/xen_domu_defconfig b/arch/ia64/configs/xen_domu_defconfig index 2bf76e418bc5..37b9b422caad 100644 --- a/arch/ia64/configs/xen_domu_defconfig +++ b/arch/ia64/configs/xen_domu_defconfig | |||
| @@ -80,6 +80,7 @@ CONFIG_NET_ETHERNET=y | |||
| 80 | CONFIG_NET_TULIP=y | 80 | CONFIG_NET_TULIP=y |
| 81 | CONFIG_TULIP=m | 81 | CONFIG_TULIP=m |
| 82 | CONFIG_NET_PCI=y | 82 | CONFIG_NET_PCI=y |
| 83 | CONFIG_NET_VENDOR_INTEL=y | ||
| 83 | CONFIG_E100=m | 84 | CONFIG_E100=m |
| 84 | CONFIG_E1000=y | 85 | CONFIG_E1000=y |
| 85 | CONFIG_TIGON3=y | 86 | CONFIG_TIGON3=y |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 1d42827f9fa4..fc7aba07c2b4 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
| @@ -57,6 +57,7 @@ CONFIG_TULIP_MMIO=y | |||
| 57 | CONFIG_TULIP_NAPI=y | 57 | CONFIG_TULIP_NAPI=y |
| 58 | CONFIG_TULIP_NAPI_HW_MITIGATION=y | 58 | CONFIG_TULIP_NAPI_HW_MITIGATION=y |
| 59 | CONFIG_NET_PCI=y | 59 | CONFIG_NET_PCI=y |
| 60 | CONFIG_NET_VENDOR_INTEL=y | ||
| 60 | CONFIG_E100=y | 61 | CONFIG_E100=y |
| 61 | CONFIG_E1000=y | 62 | CONFIG_E1000=y |
| 62 | CONFIG_TIGON3=y | 63 | CONFIG_TIGON3=y |