diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-04-08 18:08:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-04-08 18:08:09 +0200 |
| commit | ddd5609fe8b682fbe81f71b27561f14d3611d856 (patch) | |
| tree | d72d453180c0c25990524813a6b54a0555453d5e /sound/soc/codecs/rt5682.c | |
| parent | 3c6fd1f07ed03a04debbb9a9d782205f1ef5e2ab (diff) | |
| parent | ccfc531695f3a4aada042f6bdb33ac6be24e1aec (diff) | |
Merge tag 'asoc-fix-v5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.7
A collection of fixes that have been accumilated since the merge window,
mainly relating to x86 platform support.
Diffstat (limited to 'sound/soc/codecs/rt5682.c')
| -rw-r--r-- | sound/soc/codecs/rt5682.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index c9268a230daa..d36f560ad7a8 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -3703,7 +3703,7 @@ static const struct acpi_device_id rt5682_acpi_match[] = { MODULE_DEVICE_TABLE(acpi, rt5682_acpi_match); #endif -static struct i2c_driver rt5682_i2c_driver = { +static struct i2c_driver __maybe_unused rt5682_i2c_driver = { .driver = { .name = "rt5682", .of_match_table = of_match_ptr(rt5682_of_match), @@ -3713,7 +3713,10 @@ static struct i2c_driver rt5682_i2c_driver = { .shutdown = rt5682_i2c_shutdown, .id_table = rt5682_i2c_id, }; + +#ifdef CONFIG_I2C module_i2c_driver(rt5682_i2c_driver); +#endif MODULE_DESCRIPTION("ASoC RT5682 driver"); MODULE_AUTHOR("Bard Liao <bardliao@realtek.com>"); |