diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-13 10:31:58 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-01-13 10:31:58 +0100 |
| commit | df4a6b58efd4087e022a127ea32f2d4cb90b59a3 (patch) | |
| tree | e18cf5a06f1af911001f6f985140e68187af61f8 /kernel-s390x.config | |
| parent | a9d5c8c5d41973b634bd91cc5a410ce2a5518782 (diff) | |
| parent | 2d73c0a0f87170204392ee3afaaef58d0252a9f6 (diff) | |
| download | kernel-df4a6b58efd4087e022a127ea32f2d4cb90b59a3.tar.gz kernel-df4a6b58efd4087e022a127ea32f2d4cb90b59a3.tar.xz kernel-df4a6b58efd4087e022a127ea32f2d4cb90b59a3.zip | |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index be6f88d5b..1e6becce9 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5265,7 +5265,7 @@ CONFIG_THRUSTMASTER_FF=y # CONFIG_TI_ADC084S021 is not set # CONFIG_TI_ADC108S102 is not set # CONFIG_TI_ADC12138 is not set -# CONFIG_TI_ADC128S052 is not set +CONFIG_TI_ADC128S052=m # CONFIG_TI_ADC161S626 is not set CONFIG_TI_ADS1015=m # CONFIG_TI_ADS7950 is not set @@ -5669,6 +5669,7 @@ CONFIG_USB_PWC=m CONFIG_USB_RAINSHADOW_CEC=m # CONFIG_USB_RAREMONO is not set # CONFIG_USB_RIO500 is not set +CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m CONFIG_USB_S2255=m |