summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 10:24:28 +0100
committerMark Brown <broonie@kernel.org>2015-06-22 10:24:28 +0100
commitf79a9db83c6115963d8ece0cebe840db0640f7cf (patch)
treefb3f94897ebd3c6a3c5963c9e2446b9b4ecd531c
parent5445d62652f68efe97e7ceaa8ceb6b6b302035bf (diff)
parent4e0ce6a4d5bd276bd9a61763a686f3e650848da5 (diff)
Merge remote-tracking branch 'asoc/topic/rt5670' into asoc-next
-rw-r--r--sound/soc/codecs/rt5670.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 840dd6d0003a..a9123d414178 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -51,12 +51,11 @@ static const struct regmap_range_cfg rt5670_ranges[] = {
.window_len = 0x1, },
};
-static struct reg_default init_list[] = {
+static const struct reg_default init_list[] = {
{ RT5670_PR_BASE + 0x14, 0x9a8a },
{ RT5670_PR_BASE + 0x38, 0x3ba1 },
{ RT5670_PR_BASE + 0x3d, 0x3640 },
};
-#define RT5670_INIT_REG_LEN ARRAY_SIZE(init_list)
static const struct reg_default rt5670_reg[] = {
{ 0x00, 0x0000 },
@@ -2809,7 +2808,7 @@ static const struct i2c_device_id rt5670_i2c_id[] = {
MODULE_DEVICE_TABLE(i2c, rt5670_i2c_id);
#ifdef CONFIG_ACPI
-static struct acpi_device_id rt5670_acpi_match[] = {
+static const struct acpi_device_id rt5670_acpi_match[] = {
{ "10EC5670", 0},
{ },
};