diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 21:58:58 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 21:58:58 +0800 |
| commit | 2e6d603e5163e6f32a8686744b4d53e8778957ba (patch) | |
| tree | ead238ea5efe7b3f52728793fe9dfa76ca52bc31 /arch/x86/configs/x86_64_defconfig | |
| parent | 28845b079b9611b3082aa53e2dae2ea10a16a1c2 (diff) | |
| parent | 97da3854c526d3a6ee05c849c96e48d21527606c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 4.11-rc3 to pick up md5 removal from /dev/random.
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 |