ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free

[safe/jmp/linux-2.6] / sound / arm / Kconfig

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 2e4a5e0..885683a 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -1,22 +1,19 @@
 # ALSA ARM drivers
 
-menu "ALSA ARM devices"
-       depends on SND!=n && ARM
-
-config SND_SA11XX_UDA1341
-       tristate "SA11xx UDA1341TS driver (iPaq H3600)"
-       depends on ARCH_SA1100 && SND && L3
-       select SND_PCM
+menuconfig SND_ARM
+       bool "ARM sound devices"
+       depends on ARM
+       default y
        help
-         Say Y here if you have a Compaq iPaq H3x00 handheld computer
-         and want to use its Philips UDA 1341 audio chip.
+         Support for sound devices specific to ARM architectures.
+         Drivers that are implemented on ASoC can be found in
+         "ALSA for SoC audio support" section.
 
-         To compile this driver as a module, choose M here: the module
-         will be called snd-sa11xx-uda1341.
+if SND_ARM
 
 config SND_ARMAACI
        tristate "ARM PrimeCell PL041 AC Link support"
-       depends on SND && ARM_AMBA
+       depends on ARM_AMBA
        select SND_PCM
        select SND_AC97_CODEC
 
@@ -24,13 +21,23 @@ config SND_PXA2XX_PCM
        tristate
        select SND_PCM
 
+config SND_PXA2XX_LIB
+       tristate
+       select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
+
+config SND_PXA2XX_LIB_AC97
+       bool
+
 config SND_PXA2XX_AC97
        tristate "AC97 driver for the Intel PXA2xx chip"
-       depends on ARCH_PXA && SND
+       depends on ARCH_PXA
        select SND_PXA2XX_PCM
        select SND_AC97_CODEC
+       select SND_PXA2XX_LIB
+       select SND_PXA2XX_LIB_AC97
        help
          Say Y or M if you want to support any AC97 codec attached to
          the PXA2xx AC97 interface.
 
-endmenu
+endif  # SND_ARM
+