diff options
author | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
commit | 2927e6d398d0fca52d8f011a89dcfcabb2b1abfd (patch) | |
tree | 30ddd4cddded855db423c290512d7be7c13dc9db /sound/soc/sh | |
parent | 6395a6213b8367bb55c3b940f663eda772d7c19c (diff) | |
parent | b976a5adf32eee7db928b5b77cffa3b008ebf2ff (diff) |
Merge branch 'asoc-5.11' into asoc-5.12
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/siu.h | 2 | ||||
-rw-r--r-- | sound/soc/sh/siu_pcm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/siu.h b/sound/soc/sh/siu.h index 6201840f1bc0..a675c36fc9d9 100644 --- a/sound/soc/sh/siu.h +++ b/sound/soc/sh/siu.h @@ -169,7 +169,7 @@ static inline u32 siu_read32(u32 __iomem *addr) #define SIU_BRGBSEL (0x108 / sizeof(u32)) #define SIU_BRRB (0x10c / sizeof(u32)) -extern struct snd_soc_component_driver siu_component; +extern const struct snd_soc_component_driver siu_component; extern struct siu_info *siu_i2s_data; int siu_init_port(int port, struct siu_port **port_info, struct snd_card *card); diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 45c4320976ab..4785886df4f0 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -543,7 +543,7 @@ static void siu_pcm_free(struct snd_soc_component *component, dev_dbg(pcm->card->dev, "%s\n", __func__); } -struct const snd_soc_component_driver siu_component = { +const struct snd_soc_component_driver siu_component = { .name = DRV_NAME, .open = siu_pcm_open, .close = siu_pcm_close, |