diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-07 21:27:23 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-07 21:27:23 +0100 |
| commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
| tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/ia64/configs/zx1_defconfig | |
| parent | ARM: OMAP2: Fix H4 matrix keyboard warning (diff) | |
| parent | ARM: OMAP: Fix export.h or module.h includes (diff) | |
| download | linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.zip | |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/ia64/configs/zx1_defconfig')
| -rw-r--r-- | arch/ia64/configs/zx1_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
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 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 |