diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-16 21:35:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-16 21:35:01 +0100 |
| commit | 7d9fb377a747025232fe4e8d17e54ff8032aba27 (patch) | |
| tree | 275856c60130b84301673f3c9a302296227bee55 /sound/soc/codecs/da7210.c | |
| parent | 1c07a4de5baad76585f7ffb86b5b0bc34c33e8a6 (diff) | |
| parent | c418a84a8c8f98b1a0f30cd68d0cdf40d77aed01 (diff) | |
Merge branches 'topic/owner' and 'topic/reg-default' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-max9877
Diffstat (limited to 'sound/soc/codecs/da7210.c')
| -rw-r--r-- | sound/soc/codecs/da7210.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 9c7b41a8642d..457ed82d3e10 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -680,7 +680,7 @@ struct da7210_priv { int master; }; -static struct reg_default da7210_reg_defaults[] = { +static const struct reg_default da7210_reg_defaults[] = { { 0x00, 0x00 }, { 0x01, 0x11 }, { 0x03, 0x00 }, @@ -1182,7 +1182,7 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = { #if IS_ENABLED(CONFIG_I2C) -static struct reg_default da7210_regmap_i2c_patch[] = { +static const struct reg_default da7210_regmap_i2c_patch[] = { /* System controller master disable */ { DA7210_STARTUP1, 0x00 }, @@ -1268,7 +1268,7 @@ static struct i2c_driver da7210_i2c_driver = { #if defined(CONFIG_SPI_MASTER) -static struct reg_default da7210_regmap_spi_patch[] = { +static const struct reg_default da7210_regmap_spi_patch[] = { /* Dummy read to give two pulses over nCS for SPI */ { DA7210_AUX2, 0x00 }, { DA7210_AUX2, 0x00 }, |