diff options
author | andy.hu <andy.hu@starfivetech.com> | 2022-06-21 15:05:47 +0300 |
---|---|---|
committer | andy.hu <andy.hu@starfivetech.com> | 2022-06-21 15:05:47 +0300 |
commit | d60e4ddb2243a0309f8a40d6dac4161adfaef3ac (patch) | |
tree | f5a02f70d4a9155e11772681f1e34933987a554c /drivers/usb/cdns3/cdns3-debug.h | |
parent | 8dd16747c40c322ba89092e2fba5414a32697de6 (diff) | |
parent | 1e9c640ea560a755879d1db1a4d6b2cf797246c1 (diff) | |
download | linux-d60e4ddb2243a0309f8a40d6dac4161adfaef3ac.tar.xz |
Merge branch 'CR_1280_i2s_master_walker.chen' into 'jh7110-5.15.y-devel'
Fix the conflict between with i2s and pdm while using i2srx
See merge request sdk/linux!134
Diffstat (limited to 'drivers/usb/cdns3/cdns3-debug.h')
0 files changed, 0 insertions, 0 deletions