Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342698
b: refs/heads/master
c: 92dfa61
h: refs/heads/master
v: v3
  • Loading branch information
Bo Shen authored and Mark Brown committed Dec 2, 2012
1 parent 054c9d0 commit b16cb9b
Show file tree
Hide file tree
Showing 7 changed files with 442 additions and 383 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 31974361761b18e07e821d3b262e34f1a2d105cb
refs/heads/master: 92dfa61986237f849bb6ff5190380b3bf69335d2
5 changes: 5 additions & 0 deletions trunk/sound/soc/atmel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ config SND_ATMEL_SOC
the ATMEL SSC interface. You will also need
to select the audio interfaces to support below.

config SND_ATMEL_SOC_PDC
tristate
depends on SND_ATMEL_SOC

config SND_ATMEL_SOC_SSC
tristate
depends on SND_ATMEL_SOC
Expand All @@ -17,6 +21,7 @@ config SND_ATMEL_SOC_SSC
config SND_AT91_SOC_SAM9G20_WM8731
tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
depends on ATMEL_SSC && SND_ATMEL_SOC && AT91_PROGRAMMABLE_CLOCKS
select SND_ATMEL_SOC_PDC
select SND_ATMEL_SOC_SSC
select SND_SOC_WM8731
help
Expand Down
2 changes: 2 additions & 0 deletions trunk/sound/soc/atmel/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# AT91 Platform Support
snd-soc-atmel-pcm-objs := atmel-pcm.o
snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o
snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o

obj-$(CONFIG_SND_ATMEL_SOC) += snd-soc-atmel-pcm.o
obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o
obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o

# AT91 Machine Support
Expand Down
Loading

0 comments on commit b16cb9b

Please sign in to comment.