From a015b165ccd5abda29bb5976d35b0b4b1ecac206 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 27 Mar 2013 12:02:22 +0100 Subject: [PATCH] --- yaml --- r: 371876 b: refs/heads/master c: d79e57db84f8359bc96418900f86b8fc4189eff9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/sound/soc.h | 4 ++-- trunk/sound/soc/soc-core.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8227ef6f7fd1..1eb79bbed8ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36300fd09823be8f7d6feaaa79ddbf54cf205378 +refs/heads/master: d79e57db84f8359bc96418900f86b8fc4189eff9 diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h index c84062b22221..5fb70d1e8cce 100644 --- a/trunk/include/sound/soc.h +++ b/trunk/include/sound/soc.h @@ -371,7 +371,7 @@ int snd_soc_suspend(struct device *dev); int snd_soc_resume(struct device *dev); int snd_soc_poweroff(struct device *dev); int snd_soc_register_platform(struct device *dev, - struct snd_soc_platform_driver *platform_drv); + const struct snd_soc_platform_driver *platform_drv); void snd_soc_unregister_platform(struct device *dev); int snd_soc_register_codec(struct device *dev, const struct snd_soc_codec_driver *codec_drv, @@ -823,7 +823,7 @@ struct snd_soc_platform { const char *name; int id; struct device *dev; - struct snd_soc_platform_driver *driver; + const struct snd_soc_platform_driver *driver; struct mutex mutex; unsigned int suspended:1; /* platform is suspended */ diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 0ce075c47b25..4d24b5ea3ba7 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -3906,7 +3906,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dais); * @platform: platform to register */ int snd_soc_register_platform(struct device *dev, - struct snd_soc_platform_driver *platform_drv) + const struct snd_soc_platform_driver *platform_drv) { struct snd_soc_platform *platform;