diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-05 07:39:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-05 07:39:02 +0200 |
| commit | d37537a1f7cf09e304fe7993cb5e732534a0fb22 (patch) | |
| tree | f9894c8e18496941e28499b7fc1ccb01569db526 /drivers/soc | |
| parent | 243ff7e6a03533fd5f34036b4a2c297d844ffdc0 (diff) | |
| parent | 9561de3a55bed6bdd44a12820ba81ec416e705a7 (diff) | |
| download | linux-stable-d37537a1f7cf09e304fe7993cb5e732534a0fb22.tar.gz linux-stable-d37537a1f7cf09e304fe7993cb5e732534a0fb22.tar.bz2 linux-stable-d37537a1f7cf09e304fe7993cb5e732534a0fb22.zip | |
Merge 6.4-rc5 into usb-next
We need the USB fixes in here are well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/fsl/qe/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig index 7268c2fbcbc1..e0d096607fef 100644 --- a/drivers/soc/fsl/qe/Kconfig +++ b/drivers/soc/fsl/qe/Kconfig @@ -36,7 +36,7 @@ config UCC config CPM_TSA tristate "CPM TSA support" depends on OF && HAS_IOMEM - depends on CPM1 || COMPILE_TEST + depends on CPM1 || (CPM && COMPILE_TEST) help Freescale CPM Time Slot Assigner (TSA) controller. @@ -47,7 +47,7 @@ config CPM_TSA config CPM_QMC tristate "CPM QMC support" depends on OF && HAS_IOMEM - depends on CPM1 || (FSL_SOC && COMPILE_TEST) + depends on CPM1 || (FSL_SOC && CPM && COMPILE_TEST) depends on CPM_TSA help Freescale CPM QUICC Multichannel Controller |