diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
| commit | cf54d47c13c2b171f946289de445102c676d4258 (patch) | |
| tree | c7e88f33402257f3e06bc708e58843518d8ca17b /sound/soc/atmel/Kconfig | |
| parent | 88d686027bb43f585914c77dd363f6e817b42c2a (diff) | |
| parent | bda63586bc5929e97288cdb371bb6456504867ed (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/atmel/Kconfig')
| -rw-r--r-- | sound/soc/atmel/Kconfig | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index bee3c94f58b0..d1fcc816ce97 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -1,6 +1,6 @@ config SND_ATMEL_SOC tristate "SoC Audio for the Atmel System-on-Chip" - depends on ARCH_AT91 || AVR32 + depends on ARCH_AT91 help Say Y or M if you want to add support for codecs attached to the ATMEL SSC interface. You will also need @@ -24,25 +24,6 @@ config SND_AT91_SOC_SAM9G20_WM8731 Say Y if you want to add support for SoC audio on WM8731-based AT91sam9g20 evaluation board. -config SND_AT32_SOC_PLAYPAQ - tristate "SoC Audio support for PlayPaq with WM8510" - depends on SND_ATMEL_SOC && BOARD_PLAYPAQ && AT91_PROGRAMMABLE_CLOCKS - select SND_ATMEL_SOC_SSC - select SND_SOC_WM8510 - help - Say Y or M here if you want to add support for SoC audio - on the LRS PlayPaq. - -config SND_AT32_SOC_PLAYPAQ_SLAVE - bool "Run CODEC on PlayPaq in slave mode" - depends on SND_AT32_SOC_PLAYPAQ - default n - help - Say Y if you want to run with the AT32 SSC generating the BCLK - and FRAME signals on the PlayPaq. Unless you want to play - with the AT32 as the SSC master, you probably want to say N here, - as this will give you better sound quality. - config SND_AT91_SOC_AFEB9260 tristate "SoC Audio support for AFEB9260 board" depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC |