diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2016-05-17 15:10:09 +0000 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2016-05-17 15:10:09 +0000 |
| commit | 99e17f8a0421fd1958bdee92e7e66c22b89d9556 (patch) | |
| tree | 15cacceadb018151ac80cd34c786cef5818d614d /sound/soc/samsung/s3c-i2s-v2.h | |
| parent | 914edc40eafa0dabf561bf29c8e768a4b636e7f5 (diff) | |
| parent | 08e85b5fa9b0d262c8d69709088ec7fbbab2ad28 (diff) | |
Merge branch 'android-hikey-linaro-4.4' of https://android.googlesource.com/kernel/hikey-linaro into clang-4.4android-hikey-linaro-4.4-clang
Diffstat (limited to 'sound/soc/samsung/s3c-i2s-v2.h')
| -rw-r--r-- | sound/soc/samsung/s3c-i2s-v2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c-i2s-v2.h b/sound/soc/samsung/s3c-i2s-v2.h index 90abab364b49..d0684145ed1f 100644 --- a/sound/soc/samsung/s3c-i2s-v2.h +++ b/sound/soc/samsung/s3c-i2s-v2.h @@ -101,7 +101,7 @@ extern int s3c_i2sv2_probe(struct snd_soc_dai *dai, * soc core. */ extern int s3c_i2sv2_register_component(struct device *dev, int id, - struct snd_soc_component_driver *cmp_drv, + const struct snd_soc_component_driver *cmp_drv, struct snd_soc_dai_driver *dai_drv); #endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */ |