diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-26 07:37:16 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-26 07:37:16 +0100 |
| commit | d32415f8aa428b5c572c218697f3836cb6c4b8f1 (patch) | |
| tree | fcc393e99e76b45259136ea1a0374950bd4c489c /config-x86_64-generic | |
| parent | fc5410a106760808afda733ee23c11e0fc997fae (diff) | |
| parent | 04cf44e3c826554975d6f91e36402069c8e931b7 (diff) | |
| download | kernel-d32415f8aa428b5c572c218697f3836cb6c4b8f1.tar.gz kernel-d32415f8aa428b5c572c218697f3836cb6c4b8f1.tar.xz kernel-d32415f8aa428b5c572c218697f3836cb6c4b8f1.zip | |
Merge remote-tracking branch 'origin/master' into f23-user-thl-vanilla-rawhidekernel-4.5.0-0.rc1.git0.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-x86_64-generic')
| -rw-r--r-- | config-x86_64-generic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 4a811a2d2..d520cc965 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -176,8 +176,10 @@ CONFIG_THUNDERBOLT=m CONFIG_NTB=m CONFIG_NTB_NETDEV=m +CONFIG_NTB_AMD=m CONFIG_NTB_INTEL=m CONFIG_NTB_PINGPONG=m +CONFIG_NTB_PERF=m CONFIG_NTB_TOOL=m CONFIG_NTB_TRANSPORT=m |