Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/alc5632', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next

This commit is contained in:
Mark Brown
2015-02-04 20:57:07 +00:00
8 ändrade filer med 80 tillägg och 61 borttagningar

Visa fil

@@ -1068,7 +1068,7 @@ static int alc5632_probe(struct snd_soc_codec *codec)
return 0;
}
static struct snd_soc_codec_driver soc_codec_device_alc5632 = {
static const struct snd_soc_codec_driver soc_codec_device_alc5632 = {
.probe = alc5632_probe,
.resume = alc5632_resume,
.set_bias_level = alc5632_set_bias_level,
@@ -1082,7 +1082,7 @@ static struct snd_soc_codec_driver soc_codec_device_alc5632 = {
.num_dapm_routes = ARRAY_SIZE(alc5632_dapm_routes),
};
static struct regmap_config alc5632_regmap = {
static const struct regmap_config alc5632_regmap = {
.reg_bits = 8,
.val_bits = 16,