diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 10:03:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-27 10:03:28 +0200 |
commit | e6aa42f93751e4d9ac8505b7ac57acd5506bdec9 (patch) | |
tree | 3bdbb589c7e0abeb111cdd142f647fd21c762355 /drivers/usb/typec/tcpm | |
parent | 508aeb54e4f0225f4ff3da9b7ec8ac44ce30aad8 (diff) | |
parent | 03c765b0e3b4cb5063276b086c76f7a612856a9a (diff) | |
download | linux-stable-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.tar.gz linux-stable-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.tar.bz2 linux-stable-e6aa42f93751e4d9ac8505b7ac57acd5506bdec9.zip |
Merge 5.19-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/tcpm')
-rw-r--r-- | drivers/usb/typec/tcpm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/typec/tcpm/Kconfig b/drivers/usb/typec/tcpm/Kconfig index 557f392fe24d..073fd2ea5e0b 100644 --- a/drivers/usb/typec/tcpm/Kconfig +++ b/drivers/usb/typec/tcpm/Kconfig @@ -56,7 +56,6 @@ config TYPEC_WCOVE tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver" depends on ACPI depends on MFD_INTEL_PMC_BXT - depends on INTEL_SOC_PMIC depends on BXT_WC_PMIC_OPREGION help This driver adds support for USB Type-C on Intel Broxton platforms |