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
672b0c6a
Commit
672b0c6a
authored
Dec 03, 2011
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-3.2' into for-3.3
parents
7d46a528
36d54dc0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
sound/soc/kirkwood/Kconfig
sound/soc/kirkwood/Kconfig
+2
-1
No files found.
sound/soc/kirkwood/Kconfig
View file @
672b0c6a
...
@@ -12,6 +12,7 @@ config SND_KIRKWOOD_SOC_I2S
...
@@ -12,6 +12,7 @@ config SND_KIRKWOOD_SOC_I2S
config SND_KIRKWOOD_SOC_OPENRD
config SND_KIRKWOOD_SOC_OPENRD
tristate "SoC Audio support for Kirkwood Openrd Client"
tristate "SoC Audio support for Kirkwood Openrd Client"
depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)
depends on I2C
select SND_KIRKWOOD_SOC_I2S
select SND_KIRKWOOD_SOC_I2S
select SND_SOC_CS42L51
select SND_SOC_CS42L51
help
help
...
@@ -20,7 +21,7 @@ config SND_KIRKWOOD_SOC_OPENRD
...
@@ -20,7 +21,7 @@ config SND_KIRKWOOD_SOC_OPENRD
config SND_KIRKWOOD_SOC_T5325
config SND_KIRKWOOD_SOC_T5325
tristate "SoC Audio support for HP t5325"
tristate "SoC Audio support for HP t5325"
depends on SND_KIRKWOOD_SOC && MACH_T5325
depends on SND_KIRKWOOD_SOC && MACH_T5325
&& I2C
select SND_KIRKWOOD_SOC_I2S
select SND_KIRKWOOD_SOC_I2S
select SND_SOC_ALC5623
select SND_SOC_ALC5623
help
help
...
...
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