mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
This commit is contained in:
commit
40e8cc5689
4 changed files with 6 additions and 6 deletions
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Driver for the PCM512x CODECs
|
* Driver for the PCM512x CODECs
|
||||||
*
|
*
|
||||||
* Author: Mark Brown <broonie@linaro.org>
|
* Author: Mark Brown <broonie@kernel.org>
|
||||||
* Copyright 2014 Linaro Ltd
|
* Copyright 2014 Linaro Ltd
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* 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_i2c_driver(pcm512x_i2c_driver);
|
||||||
|
|
||||||
MODULE_DESCRIPTION("ASoC PCM512x codec driver - I2C");
|
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");
|
MODULE_LICENSE("GPL v2");
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Driver for the PCM512x CODECs
|
* Driver for the PCM512x CODECs
|
||||||
*
|
*
|
||||||
* Author: Mark Brown <broonie@linaro.org>
|
* Author: Mark Brown <broonie@kernel.org>
|
||||||
* Copyright 2014 Linaro Ltd
|
* Copyright 2014 Linaro Ltd
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Driver for the PCM512x CODECs
|
* Driver for the PCM512x CODECs
|
||||||
*
|
*
|
||||||
* Author: Mark Brown <broonie@linaro.org>
|
* Author: Mark Brown <broonie@kernel.org>
|
||||||
* Copyright 2014 Linaro Ltd
|
* Copyright 2014 Linaro Ltd
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* 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);
|
EXPORT_SYMBOL_GPL(pcm512x_pm_ops);
|
||||||
|
|
||||||
MODULE_DESCRIPTION("ASoC PCM512x codec driver");
|
MODULE_DESCRIPTION("ASoC PCM512x codec driver");
|
||||||
MODULE_AUTHOR("Mark Brown <broonie@linaro.org>");
|
MODULE_AUTHOR("Mark Brown <broonie@kernel.org>");
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL v2");
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Driver for the PCM512x CODECs
|
* Driver for the PCM512x CODECs
|
||||||
*
|
*
|
||||||
* Author: Mark Brown <broonie@linaro.org>
|
* Author: Mark Brown <broonie@kernel.org>
|
||||||
* Copyright 2014 Linaro Ltd
|
* Copyright 2014 Linaro Ltd
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
|
|
Loading…
Reference in a new issue