diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-12 20:49:33 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-12 20:49:33 +0200 |
commit | aabea4a87ff50dd682d08e5a0756d68264ddb7b6 (patch) | |
tree | 53804dd1cb5ed82e14c584ec20c85bfb1062de25 /kernel-armv7hl-debug.config | |
parent | b71366e6199e406f90d502e2de7c51c50cc92b64 (diff) | |
parent | 48844fd6b6148e7588db436d0fd6e2772bb6c218 (diff) | |
download | kernel-4.11.10-300.vanilla.knurd.1.fc26.tar.gz kernel-4.11.10-300.vanilla.knurd.1.fc26.tar.xz kernel-4.11.10-300.vanilla.knurd.1.fc26.zip |
Merge remote-tracking branch 'origin/f26' into f26-user-thl-vanilla-fedorakernel-4.11.10-300.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-armv7hl-debug.config')
-rw-r--r-- | kernel-armv7hl-debug.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index d586c5724..29b3519e8 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2116,7 +2116,7 @@ CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set CONFIG_I2C_QUP=m -CONFIG_I2C_RK3X=m +CONFIG_I2C_RK3X=y # CONFIG_I2C_ROBOTFUZZ_OSIF is not set CONFIG_I2C_S3C2410=m CONFIG_I2C_SI470X=m @@ -6135,7 +6135,7 @@ CONFIG_USB_CHAOSKEY=m CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y |