Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 40e8cc56 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

parents c44ff31a da924c3a

sound/soc/codecs/pcm512x-i2c.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Driver for the PCM512x CODECs

 *

 * Author:	Mark Brown <broonie@linaro.org>

 * Author:	Mark Brown <broonie@kernel.org>

 *		Copyright 2014 Linaro Ltd

 *

 * This program is free software; you can redistribute it and/or
@@ -75,5 +75,5 @@ static struct i2c_driver pcm512x_i2c_driver = { 
module_i2c_driver(pcm512x_i2c_driver);



MODULE_DESCRIPTION("ASoC PCM512x codec driver - I2C");

MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");

MODULE_AUTHOR("Mark Brown <broonie@kernel.org>");

MODULE_LICENSE("GPL v2");

sound/soc/codecs/pcm512x-spi.c

+1 −1
Original line number Diff line number Diff line 
/*

 * Driver for the PCM512x CODECs

 *

 * Author:	Mark Brown <broonie@linaro.org>

 * Author:	Mark Brown <broonie@kernel.org>

 *		Copyright 2014 Linaro Ltd

 *

 * This program is free software; you can redistribute it and/or

sound/soc/codecs/pcm512x.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Driver for the PCM512x CODECs

 *

 * Author:	Mark Brown <broonie@linaro.org>

 * Author:	Mark Brown <broonie@kernel.org>

 *		Copyright 2014 Linaro Ltd

 *

 * This program is free software; you can redistribute it and/or
@@ -1602,5 +1602,5 @@ const struct dev_pm_ops pcm512x_pm_ops = { 
EXPORT_SYMBOL_GPL(pcm512x_pm_ops);



MODULE_DESCRIPTION("ASoC PCM512x codec driver");

MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");

MODULE_AUTHOR("Mark Brown <broonie@kernel.org>");

MODULE_LICENSE("GPL v2");

sound/soc/codecs/pcm512x.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Driver for the PCM512x CODECs

 *

 * Author:	Mark Brown <broonie@linaro.org>

 * Author:	Mark Brown <broonie@kernel.org>

 *		Copyright 2014 Linaro Ltd

 *

 * This program is free software; you can redistribute it and/or