diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-08 14:51:14 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-08 14:51:14 +0200 |
| commit | c8c0be7bc1c37a1289d68a01ba648673604ae3f3 (patch) | |
| tree | 67c319e4bfe4b33c96d53b36907f4d18d4e8aa4a /kernel-ppc64le.config | |
| parent | 997c4ca277d528930e4794cfa20d58d98e210e06 (diff) | |
| parent | a746c6151cd78bb8d9f930c81121effe79266512 (diff) | |
| download | kernel-c8c0be7bc1c37a1289d68a01ba648673604ae3f3.tar.gz kernel-c8c0be7bc1c37a1289d68a01ba648673604ae3f3.tar.xz kernel-c8c0be7bc1c37a1289d68a01ba648673604ae3f3.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc0.git3.1.vanilla.knurd.1.fc27kernel-4.13.0-0.rc0.git3.1.vanilla.knurd.1.fc25kernel-4.13.0-0.rc0.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-ppc64le.config')
| -rw-r--r-- | kernel-ppc64le.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 192cd9a48..4000aa0d2 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4992,7 +4992,6 @@ CONFIG_TIPC=m CONFIG_TIPC_MEDIA_UDP=y CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_ST is not set -# CONFIG_TI_SYSCON_RESET is not set # CONFIG_TI_TLC4541 is not set CONFIG_TLAN=m CONFIG_TLS=m |