diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-16 14:54:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-16 14:54:00 +0100 |
| commit | 2aff4c9ce898b9079658650c1ab33c44b100a203 (patch) | |
| tree | 66f3d8367c315c7fa1267bdb27d0bd923b8ce46f /sound/soc/bcm/Kconfig | |
| parent | c48ae0ab3790efba2dfb1a4709c0ef8da024de1a (diff) | |
| parent | 701caa51a2ce74182d39380ca11defeb163d98c1 (diff) | |
| download | linux-2aff4c9ce898b9079658650c1ab33c44b100a203.tar.gz linux-2aff4c9ce898b9079658650c1ab33c44b100a203.tar.bz2 linux-2aff4c9ce898b9079658650c1ab33c44b100a203.zip | |
Merge tag 'asoc-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.14
A few more updates for v3.14 since the last set, highlights include:
- Lots of DMA updates from Lars-Peter
- Improvements to the constraints handling code from Lars-Peter
- A very helpful conversion of the TWL4030 driver to regmap from Peter
- A new driver for the Freescale ESAI controller from Nicolin Chen
- Conversion of some of the drivers to use params_width()
Diffstat (limited to 'sound/soc/bcm/Kconfig')
| -rw-r--r-- | sound/soc/bcm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig index 3d82a29ce3a8..6a834e109f1d 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -1,7 +1,6 @@ config SND_BCM2835_SOC_I2S tristate "SoC Audio support for the Broadcom BCM2835 I2S module" depends on ARCH_BCM2835 || COMPILE_TEST - select SND_SOC_DMAENGINE_PCM select SND_SOC_GENERIC_DMAENGINE_PCM select REGMAP_MMIO help |