diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 16:27:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 16:27:53 -0700 |
| commit | 05e30f01b70e5f75f3c3a62010c0f059826da565 (patch) | |
| tree | 1beddde372fe6accfa2305afc8a92587cbae5ef5 /arch/x86/configs | |
| parent | 9a45f036af363aec1efec08827c825d69c115a9a (diff) | |
| parent | 7a09b225f31031f8cac9e7801b6004e79f8b0da1 (diff) | |
| download | talos-obmc-linux-05e30f01b70e5f75f3c3a62010c0f059826da565.tar.gz talos-obmc-linux-05e30f01b70e5f75f3c3a62010c0f059826da565.zip | |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86-64 defconfig update from Ingo Molnar:
"Small defconfig addition"
[ I'm not actually convinced our defconfig is sensible, but whatever ]
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/build/defconfig/64: Enable CONFIG_E1000E=y
Diffstat (limited to 'arch/x86/configs')
| -rw-r--r-- | arch/x86/configs/x86_64_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 4f404a64681b..0c8d7963483c 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig @@ -173,6 +173,7 @@ CONFIG_TIGON3=y CONFIG_NET_TULIP=y CONFIG_E100=y CONFIG_E1000=y +CONFIG_E1000E=y CONFIG_SKY2=y CONFIG_FORCEDETH=y CONFIG_8139TOO=y |
