Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
8dbc8950
Commit
8dbc8950
authored
Sep 15, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
parents
9e82bf01
b794dbcd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
sound/soc/codecs/sta529.c
sound/soc/codecs/sta529.c
+2
-2
sound/soc/dwc/designware_i2s.c
sound/soc/dwc/designware_i2s.c
+2
-2
sound/soc/spear/spear_pcm.c
sound/soc/spear/spear_pcm.c
+2
-2
No files found.
sound/soc/codecs/sta529.c
View file @
8dbc8950
...
...
@@ -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 <rajeev
kumar.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 <rajeev
kumar.linux@gmail
.com>"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/dwc/designware_i2s.c
View file @
8dbc8950
...
...
@@ -4,7 +4,7 @@
* sound/soc/dwc/designware_i2s.c
*
* Copyright (C) 2010 ST Microelectronics
* Rajeev Kumar <rajeev
-dlh.kumar@st
.com>
* Rajeev Kumar <rajeev
kumar.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 <rajeev
kumar.linux@gmail
.com>"
);
MODULE_DESCRIPTION
(
"DESIGNWARE I2S SoC Interface"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_ALIAS
(
"platform:designware_i2s"
);
sound/soc/spear/spear_pcm.c
View file @
8dbc8950
...
...
@@ -4,7 +4,7 @@
* sound/soc/spear/spear_pcm.c
*
* Copyright (C) 2012 ST Microelectronics
* Rajeev Kumar<rajeev
-dlh.kumar@st
.com>
* Rajeev Kumar<rajeev
kumar.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 <rajeev
kumar.linux@gmail
.com>"
);
MODULE_DESCRIPTION
(
"SPEAr PCM DMA module"
);
MODULE_LICENSE
(
"GPL"
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment