diff options
| author | Al Viro | 2017-04-06 02:07:33 -0400 |
|---|---|---|
| committer | Al Viro | 2017-04-06 02:07:33 -0400 |
| commit | 054838bc019c90511d034fb796dc8c7715460fc2 (patch) | |
| tree | a04b9fa86e3cfb8adb285fcd33bd47983f75d8fb /arch/x86/configs/x86_64_defconfig | |
| parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
| parent | fc69910f329d61821897871e0e957eda39beb3d8 (diff) | |
Merge commit 'fc69910f329d' into uaccess.mips
backmerge of a build fix from mainline
Diffstat (limited to 'arch/x86/configs/x86_64_defconfig')
| -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 7ef4a099defc..6205d3b81e6d 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig @@ -176,6 +176,7 @@ CONFIG_E1000E=y CONFIG_SKY2=y CONFIG_FORCEDETH=y CONFIG_8139TOO=y +CONFIG_R8169=y CONFIG_FDDI=y CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |