diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:56 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 13:56:56 +0100 |
commit | 13419625774f9f3e65e07257ad2a7beb445e9942 (patch) | |
tree | e106f4be80e6c8f6cc3be861cd555718a3142ab7 /sound/soc/samsung/s3c-i2s-v2.c | |
parent | 604c724ba38f6ecc82c9023bee692a7b2fb7e0ee (diff) | |
parent | 89cab4624a8c0ed81a1b74b6f8c884641cac5b9d (diff) |
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
Diffstat (limited to 'sound/soc/samsung/s3c-i2s-v2.c')
-rw-r--r-- | sound/soc/samsung/s3c-i2s-v2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index 7a73380b356..20e98d1dded 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -731,8 +731,9 @@ static int s3c2412_i2s_resume(struct snd_soc_dai *dai) #define s3c2412_i2s_resume NULL #endif -int s3c_i2sv2_register_dai(struct device *dev, int id, - struct snd_soc_dai_driver *drv) +int s3c_i2sv2_register_component(struct device *dev, int id, + struct snd_soc_component_driver *cmp_drv, + struct snd_soc_dai_driver *dai_drv) { struct snd_soc_dai_ops *ops = drv->ops; @@ -750,8 +751,8 @@ int s3c_i2sv2_register_dai(struct device *dev, int id, drv->suspend = s3c2412_i2s_suspend; drv->resume = s3c2412_i2s_resume; - return snd_soc_register_dai(dev, drv); + return snd_soc_register_component(dev, cmp_drv, dai_drv, 1); } -EXPORT_SYMBOL_GPL(s3c_i2sv2_register_dai); +EXPORT_SYMBOL_GPL(s3c_i2sv2_register_component); MODULE_LICENSE("GPL"); |