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

Commit e87a925f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

parents 2ce7598c b794dbcd

sound/soc/codecs/sta529.c

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * sound/soc/codecs/sta529.c -- spear ALSA Soc codec driver

 *

 * Copyright (C) 2012 ST Microelectronics

 * Rajeev Kumar <rajeev-dlh.kumar@st.com>

 * Rajeev Kumar <rajeevkumar.linux@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any
@@ -426,5 +426,5 @@ static struct i2c_driver sta529_i2c_driver = { 
module_i2c_driver(sta529_i2c_driver);



MODULE_DESCRIPTION("ASoC STA529 codec driver");

MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");

MODULE_AUTHOR("Rajeev Kumar <rajeevkumar.linux@gmail.com>");

MODULE_LICENSE("GPL");

sound/soc/dwc/designware_i2s.c

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * sound/soc/dwc/designware_i2s.c

 *

 * Copyright (C) 2010 ST Microelectronics

 * Rajeev Kumar <rajeev-dlh.kumar@st.com>

 * Rajeev Kumar <rajeevkumar.linux@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any
@@ -455,7 +455,7 @@ static struct platform_driver dw_i2s_driver = { 


module_platform_driver(dw_i2s_driver);



MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");

MODULE_AUTHOR("Rajeev Kumar <rajeevkumar.linux@gmail.com>");

MODULE_DESCRIPTION("DESIGNWARE I2S SoC Interface");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:designware_i2s");

sound/soc/spear/spear_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * sound/soc/spear/spear_pcm.c

 *

 * Copyright (C) 2012 ST Microelectronics

 * Rajeev Kumar<rajeev-dlh.kumar@st.com>

 * Rajeev Kumar<rajeevkumar.linux@gmail.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any
@@ -50,6 +50,6 @@ int devm_spear_pcm_platform_register(struct device *dev, 
}

EXPORT_SYMBOL_GPL(devm_spear_pcm_platform_register);



MODULE_AUTHOR("Rajeev Kumar <rajeev-dlh.kumar@st.com>");

MODULE_AUTHOR("Rajeev Kumar <rajeevkumar.linux@gmail.com>");

MODULE_DESCRIPTION("SPEAr PCM DMA module");

MODULE_LICENSE("GPL");