diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-17 08:40:32 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-17 08:40:32 +0200 |
commit | cf36ae3e5802716617b9e4d902a31048240396b0 (patch) | |
tree | 2729abc9dae00a6ae10608fbd80bef8335442ed2 /sound/soc/codecs/jz4740.c | |
parent | 82a1356a933d8443139f8886f11b63c974a09a67 (diff) | |
parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging for v6.0-rc1.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'sound/soc/codecs/jz4740.c')
-rw-r--r-- | sound/soc/codecs/jz4740.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 081485f784e9..7c25acf6ff0d 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -291,8 +291,6 @@ static const struct snd_soc_component_driver soc_codec_dev_jz4740_codec = { .idle_bias_on = 1, .use_pmdown_time = 1, .endianness = 1, - .non_legacy_dai_naming = 1, - }; static const struct regmap_config jz4740_codec_regmap_config = { |