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
nexedi
linux
Commits
a04a2aca
Commit
a04a2aca
authored
Aug 22, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/au1x' into asoc-next
parents
04877397
60db923d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
sound/soc/au1x/db1200.c
sound/soc/au1x/db1200.c
+4
-0
sound/soc/au1x/psc-ac97.c
sound/soc/au1x/psc-ac97.c
+0
-3
No files found.
sound/soc/au1x/db1200.c
View file @
a04a2aca
...
...
@@ -73,12 +73,14 @@ static struct snd_soc_dai_link db1300_ac97_dai = {
static
struct
snd_soc_card
db1300_ac97_machine
=
{
.
name
=
"DB1300_AC97"
,
.
owner
=
THIS_MODULE
,
.
dai_link
=
&
db1300_ac97_dai
,
.
num_links
=
1
,
};
static
struct
snd_soc_card
db1550_ac97_machine
=
{
.
name
=
"DB1550_AC97"
,
.
owner
=
THIS_MODULE
,
.
dai_link
=
&
db1200_ac97_dai
,
.
num_links
=
1
,
};
...
...
@@ -145,6 +147,7 @@ static struct snd_soc_dai_link db1300_i2s_dai = {
static
struct
snd_soc_card
db1300_i2s_machine
=
{
.
name
=
"DB1300_I2S"
,
.
owner
=
THIS_MODULE
,
.
dai_link
=
&
db1300_i2s_dai
,
.
num_links
=
1
,
};
...
...
@@ -161,6 +164,7 @@ static struct snd_soc_dai_link db1550_i2s_dai = {
static
struct
snd_soc_card
db1550_i2s_machine
=
{
.
name
=
"DB1550_I2S"
,
.
owner
=
THIS_MODULE
,
.
dai_link
=
&
db1550_i2s_dai
,
.
num_links
=
1
,
};
...
...
sound/soc/au1x/psc-ac97.c
View file @
a04a2aca
...
...
@@ -379,9 +379,6 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
mutex_init
(
&
wd
->
lock
);
iores
=
platform_get_resource
(
pdev
,
IORESOURCE_MEM
,
0
);
if
(
!
iores
)
return
-
ENODEV
;
wd
->
mmio
=
devm_ioremap_resource
(
&
pdev
->
dev
,
iores
);
if
(
IS_ERR
(
wd
->
mmio
))
return
PTR_ERR
(
wd
->
mmio
);
...
...
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