diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-26 21:47:49 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-01-26 21:47:49 +0100 |
commit | 858f59eb64bd80474a8ceff801c88bfa91a1b2eb (patch) | |
tree | 09916bd1dbcba32d0f24f7906fda93b6025f1afd /kernel-i686.config | |
parent | 3773f620c303b9ce7f9c0ac3f566547cf4023160 (diff) | |
parent | f68a1a5b9429d69d1e3cc52a8dff4de2a70dfbf5 (diff) | |
download | kernel-4.10.0-0.rc5.git3.1.vanilla.knurd.1.fc24.tar.gz kernel-4.10.0-0.rc5.git3.1.vanilla.knurd.1.fc24.tar.xz kernel-4.10.0-0.rc5.git3.1.vanilla.knurd.1.fc24.zip |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc5.git3.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc5.git3.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc5.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686.config')
-rw-r--r-- | kernel-i686.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 0831ed641..a63bcb922 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4888,7 +4888,6 @@ CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_RCU_POINTER=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set -CONFIG_SPI_ARMADA_3700=m # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set |