diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-08 07:37:23 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-12-08 07:37:23 +0100 |
commit | 3b546ff2748786d240a824ef1ebc178c3a5229d5 (patch) | |
tree | 1cd9a46d26f9c76bdcb0d5efcd0bed254bcfa70e /kernel-armv7hl-lpae.config | |
parent | e7b8c45c20c13229bc17c715e237f4b35aa26fd1 (diff) | |
parent | 75eb8a5a5a78152622d1eff02aeb83684bcc6210 (diff) | |
download | kernel-3b546ff2748786d240a824ef1ebc178c3a5229d5.tar.gz kernel-3b546ff2748786d240a824ef1ebc178c3a5229d5.tar.xz kernel-3b546ff2748786d240a824ef1ebc178c3a5229d5.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc28kernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc27kernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc26kernel-4.15.0-0.rc2.git2.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-armv7hl-lpae.config')
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2e97c5065..494744bc4 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1858,7 +1858,7 @@ CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CMEDIA=m CONFIG_HID_CORSAIR=m -# CONFIG_HID_CP2112 is not set +CONFIG_HID_CP2112=m CONFIG_HID_CYPRESS=m CONFIG_HID_DRAGONRISE=m CONFIG_HID_ELECOM=m @@ -5911,6 +5911,7 @@ CONFIG_TUN=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC=m CONFIG_TYPEC_TCPCI=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TPS6598X=m @@ -6040,6 +6041,7 @@ CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGETFS is not set +# CONFIG_USB_GADGET_LEGACY is not set CONFIG_USB_GADGET=m CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 CONFIG_USB_GADGET_VBUS_DRAW=100 |