Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

[~andy/linux] / sound / soc / au1x / Kconfig

diff --git a/sound/soc/au1x/Kconfig b/sound/soc/au1x/Kconfig
index e908a8123110d8011ffa5a3ed8a595a118dd862b..a56104040e83e8f0870d8e8a04db4a1c7a1ec98f 100644 (file)
--- a/sound/soc/au1x/Kconfig
+++ b/sound/soc/au1x/Kconfig
@@ -1,13 +1,13 @@
 ##
-## Au1200/Au1550 PSC + DBDMA
+## Au1200/Au1550/Au1300 PSC + DBDMA
 ##
 config SND_SOC_AU1XPSC
-       tristate "SoC Audio for Au1200/Au1250/Au1550"
+       tristate "SoC Audio for Au12xx/Au13xx/Au1550"
        depends on MIPS_ALCHEMY
        help
          This option enables support for the Programmable Serial
          Controllers in AC97 and I2S mode, and the Descriptor-Based DMA
-         Controller (DBDMA) as found on the Au1200/Au1250/Au1550 SoC.
+         Controller (DBDMA) as found on the Au12xx/Au13xx/Au1550 SoC.
 
 config SND_SOC_AU1XPSC_I2S
        tristate
@@ -51,12 +51,14 @@ config SND_SOC_DB1000
          of boards (DB1000/DB1500/DB1100).
 
 config SND_SOC_DB1200
-       tristate "DB1200 AC97+I2S audio support"
+       tristate "DB1200/DB1300/DB1550 Audio support"
        depends on SND_SOC_AU1XPSC
        select SND_SOC_AU1XPSC_AC97
        select SND_SOC_AC97_CODEC
+       select SND_SOC_WM9712
        select SND_SOC_AU1XPSC_I2S
        select SND_SOC_WM8731
        help
-         Select this option to enable audio (AC97 or I2S) on the
-         Alchemy/AMD/RMI DB1200 demoboard.
+         Select this option to enable audio (AC97 and I2S) on the
+         Alchemy/AMD/RMI/NetLogic Db1200, Db1550 and Db1300 evaluation boards.
+         If you need Db1300 touchscreen support, you definitely want to say Y.