diff options
author | Jani Nikula <jani.nikula@intel.com> | 2024-09-11 09:57:18 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2024-09-11 09:57:18 +0200 |
commit | 02189ca8411253aa1328e9dd6137a40e390a5b37 (patch) | |
tree | 94aa1a3f7aa6e863a790092dfe9d3b53c27565c3 /sound/soc/codecs/tda7419.c | |
parent | drm/i915/bios: fix printk format width (diff) | |
parent | Merge v6.11-rc7 into drm-next (diff) | |
download | linux-02189ca8411253aa1328e9dd6137a40e390a5b37.tar.xz linux-02189ca8411253aa1328e9dd6137a40e390a5b37.zip |
Merge drm/drm-next into drm-intel-next
Sync the branches to resolve the conflict reported in the below link.
Link: https://lore.kernel.org/r/20240906131502.7a7d1962@canb.auug.org.au
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'sound/soc/codecs/tda7419.c')
-rw-r--r-- | sound/soc/codecs/tda7419.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/tda7419.c b/sound/soc/codecs/tda7419.c index 386b99c8023b..7d6fcba9986e 100644 --- a/sound/soc/codecs/tda7419.c +++ b/sound/soc/codecs/tda7419.c @@ -623,6 +623,7 @@ static const struct of_device_id tda7419_of_match[] = { { .compatible = "st,tda7419" }, { }, }; +MODULE_DEVICE_TABLE(of, tda7419_of_match); static struct i2c_driver tda7419_driver = { .driver = { |