diff options
| author | Jassi Brar <jassi.brar@samsung.com> | 2010-11-22 15:35:36 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 14:02:11 +0000 |
| commit | 3a56d0ca72f8fc47240849b83acacd1c92283b99 (patch) | |
| tree | bdbbb0b2bcd6ca6079363b5e66a27ee284cf8ef2 /sound/soc/s3c24xx/Kconfig | |
| parent | cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (diff) | |
| download | op-kernel-dev-3a56d0ca72f8fc47240849b83acacd1c92283b99.zip op-kernel-dev-3a56d0ca72f8fc47240849b83acacd1c92283b99.tar.gz | |
ASoC: Samsung: Remove redundant AQUILA driver
AQUILA and GONI are essentially the same h/w w.r.t ASoC.
They only differ by the fact that GONI has stereo speaker-out
whereas AQUILA has mono.
The difference can easily be handled in the same MACHINE driver
by making machine-specific runtime changes.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/Kconfig')
| -rw-r--r-- | sound/soc/s3c24xx/Kconfig | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index d85bf8a..226f831 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -145,22 +145,13 @@ config SND_S3C64XX_SOC_SMARTQ select SND_S3C64XX_SOC_I2S select SND_SOC_WM8750 -config SND_S5PC110_SOC_AQUILA_WM8994 - tristate "SoC I2S Audio support for AQUILA - WM8994" - depends on SND_S3C24XX_SOC && MACH_AQUILA +config SND_SOC_GONI_AQUILA_WM8994 + tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" + depends on SND_S3C24XX_SOC && (MACH_GONI || MACH_AQUILA) select SND_S3C64XX_SOC_I2S_V4 select SND_SOC_WM8994 help - Say Y if you want to add support for SoC audio on aquila - with the WM8994. - -config SND_S5PV210_SOC_GONI_WM8994 - tristate "SoC I2S Audio support for GONI - WM8994" - depends on SND_S3C24XX_SOC && MACH_GONI - select SND_S3C64XX_SOC_I2S_V4 - select SND_SOC_WM8994 - help - Say Y if you want to add support for SoC audio on goni + Say Y if you want to add support for SoC audio on goni or aquila with the WM8994. config SND_SOC_SMDK_SPDIF |
