diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-03-02 20:30:07 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-03-02 20:30:07 +0300 |
| commit | 9b838a3c32d7a1edd7edeec1bc455eca76622218 (patch) | |
| tree | b959299355265d21586c3782fa93f0a5a2ac068d /drivers/rtc/rtc-meson.c | |
| parent | a864e8f159b13babf552aff14a5fbe11abc017e4 (diff) | |
| parent | ffd7e705fad695fc0abd5809ef8dc72cda7e49a6 (diff) | |
| download | linux-9b838a3c32d7a1edd7edeec1bc455eca76622218.tar.xz | |
Merge tag 'tags/sound-sdw-kconfig-fixes' into for-linus
ALSA/ASoC/SOF/SoundWire: fix Kconfig issues
In January, Intel kbuild bot and Arnd Bergmann reported multiple
issues with randconfig. This patchset builds on Arnd's suggestions to
a) expose ACPI and PCI devices in separate modules, while sof-acpi-dev
and sof-pci-dev become helpers. This will result in minor changes
required for developers/testers, i.e. modprobe snd-sof-pci will no
longer result in a probe. The SOF CI was already updated to deal with
this module dependency change and introduction of new modules.
b) Fix SOF/SoundWire/DSP_config dependencies by moving the code
required to detect SoundWire presence in ACPI tables to sound/hda.
Link: https://lore.kernel.org/r/20210302003125.1178419-1-pierre-louis.bossart@linux.intel.com
Diffstat (limited to 'drivers/rtc/rtc-meson.c')
| -rw-r--r-- | drivers/rtc/rtc-meson.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-meson.c b/drivers/rtc/rtc-meson.c index 8642c06565ea..44bdc8b4a90d 100644 --- a/drivers/rtc/rtc-meson.c +++ b/drivers/rtc/rtc-meson.c @@ -380,7 +380,7 @@ out_disable_vdd: return ret; } -static const struct of_device_id meson_rtc_dt_match[] = { +static const __maybe_unused struct of_device_id meson_rtc_dt_match[] = { { .compatible = "amlogic,meson6-rtc", }, { .compatible = "amlogic,meson8-rtc", }, { .compatible = "amlogic,meson8b-rtc", }, |