diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:32 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:32 +0800 |
| commit | 5a5c0904d7eab2f2ce51419fbcd4e63247413d16 (patch) | |
| tree | da0807c42b20db8689b902e6378099523484c7f2 /sound/soc/Kconfig | |
| parent | 1aba37fc5314da4ea3c3eb759b9e4c52c4404136 (diff) | |
| parent | 16be2ec95a152e65a7522f23a4c9d019325cc41d (diff) | |
Merge topic branch 'audio' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'sound/soc/Kconfig')
| -rw-r--r-- | sound/soc/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 91c985599d3..40017a437fb 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -13,7 +13,7 @@ menuconfig SND_SOC If you want ASoC support, you should say Y here and also to the specific driver for your SoC platform below. - + ASoC provides power efficient ALSA support for embedded battery powered SoC based systems like PDA's, Phones and Personal Media Players. @@ -48,6 +48,7 @@ source "sound/soc/s6000/Kconfig" source "sound/soc/sh/Kconfig" source "sound/soc/tegra/Kconfig" source "sound/soc/txx9/Kconfig" +source "sound/soc/ux500/Kconfig" # Supported codecs source "sound/soc/codecs/Kconfig" |