diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /sound/soc/fsl/Kconfig | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3368ace60977..bba9546ba5f5 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | config SND_SOC_OF_SIMPLE | ||
| 2 | tristate | ||
| 3 | |||
| 1 | config SND_SOC_MPC8610 | 4 | config SND_SOC_MPC8610 |
| 2 | bool "ALSA SoC support for the MPC8610 SOC" | 5 | bool "ALSA SoC support for the MPC8610 SOC" |
| 3 | depends on MPC8610_HPCD | 6 | depends on MPC8610_HPCD |
| @@ -14,3 +17,10 @@ config SND_SOC_MPC8610_HPCD | |||
| 14 | default y if MPC8610_HPCD | 17 | default y if MPC8610_HPCD |
| 15 | help | 18 | help |
| 16 | Say Y if you want to enable audio on the Freescale MPC8610 HPCD. | 19 | Say Y if you want to enable audio on the Freescale MPC8610 HPCD. |
| 20 | |||
| 21 | config SND_SOC_MPC5200_I2S | ||
| 22 | tristate "Freescale MPC5200 PSC in I2S mode driver" | ||
| 23 | select SND_SOC_OF_SIMPLE | ||
| 24 | depends on SND_SOC && PPC_MPC52xx | ||
| 25 | help | ||
| 26 | Say Y here to support the MPC5200 PSCs in I2S mode. | ||