diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-05 07:21:56 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-05 07:21:56 +0100 |
commit | 414a8a5a965d445a91df309574438355e5f448d4 (patch) | |
tree | 0d45f29b9606ecc6275bc095857bbe1e3d703572 /kernel-ppc64-debug.config | |
parent | f362aa1d3a9a2fe44195caf5ddf9e142bc187388 (diff) | |
parent | 49df7433692ff4d6d595dd27cb20c448c00e7e59 (diff) | |
download | kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29.tar.gz kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29.tar.xz kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-ppc64-debug.config')
-rw-r--r-- | kernel-ppc64-debug.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index eb1ec4f35..3289affb3 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -5227,7 +5227,6 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -# CONFIG_TIMER_STATS is not set CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y |