diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-29 07:22:03 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-29 07:22:03 +0200 |
| commit | 4d5923adc28999eca87472e4af644cebe0861227 (patch) | |
| tree | 3eacdbc935f006420385089f64f47ed206ba545d /kernel-armv7hl-lpae.config | |
| parent | db97001cedc77225e8d3e92a0c766d23b2cf252c (diff) | |
| parent | 7852843690e4f1bfee8ba619099ff82255cb6a10 (diff) | |
| download | kernel-4.14.0-0.rc2.git3.1.vanilla.knurd.1.fc26.tar.gz kernel-4.14.0-0.rc2.git3.1.vanilla.knurd.1.fc26.tar.xz kernel-4.14.0-0.rc2.git3.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc2.git3.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc2.git3.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-armv7hl-lpae.config')
| -rw-r--r-- | kernel-armv7hl-lpae.config | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 6fc6fa22b..74df8b400 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3994,7 +3994,6 @@ CONFIG_PATA_NETCELL=m CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87410=m CONFIG_PATA_NS87415=m -CONFIG_PATA_OF_PLATFORM=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_OPTIDMA=m CONFIG_PATA_OPTI=m @@ -5932,8 +5931,10 @@ CONFIG_USB_BELKIN=y CONFIG_USB_CATC=m CONFIG_USB_CDC_PHONET=m CONFIG_USB_CHAOSKEY=m -# CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_CHIPIDEA_ULPI is not set +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_ULPI=y CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_ECM=y |