Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Don't check invalid HP pin
  ALSA: dummy - Fix descriptions of pcm_substreams parameter
  ALSA: pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (sound)
  ALSA: hda: Use quirk mask for Dell Inspiron Mini9/Vostro A90 using ALC268
  sound: via82xx: deactivate DXS controls of inactive streams
  ALSA: snd-usb-caiaq: Bump version number to 1.3.20
  ALSA: snd-usb-caiaq: Lock on stream start/unpause
  ALSA: snd-usb-caiaq: Missing lock around use of buffer positions
  ALSA: sound/parisc: Move dereference after NULL test
  ALSA: sound: Move dereference after NULL test and drop unnecessary NULL tests
  ALSA: hda_intel: Add the Linux device ID for NVIDIA HDA controller
  ALSA: pcsp - Fix nforce workaround
  ALSA: SND_CS5535AUDIO: Remove the X86 platform dependency
  ASoC: Amstrad Delta: add info about the line discipline requirement to Kconfig help text
  ASoC: Fix possible codec_dai->ops NULL pointer problems
  ALSA: hda - Fix capture source checks for ALC662/663 codecs
  ASoC: Serialize access to dapm_power_widgets()

1 files changed, 12 insertions, 1 deletions

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 2dee9839be86..653a362425df 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -21,7 +21,18 @@ config SND_OMAP_SOC_AMS_DELTA
         select SND_OMAP_SOC_MCBSP
         select SND_SOC_CX20442
         help
-          Say Y if you want to add support for SoC audio on Amstrad Delta.
+          Say Y  if you want to add support  for SoC audio device  connected to
+          a handset and a speakerphone found on Amstrad E3 (Delta) videophone.
+
+          Note that in order to get those devices fully supported,  you have to
+          build  the kernel  with  standard  serial port  driver  included  and
+          configured for at least 4 ports.  Then, from userspace, you must load
+          a line discipline #19 on the modem (ttyS3) serial line.  The simplest
+          way to achieve this is to install util-linux-ng  and use the included
+          ldattach  utility.  This  can be  started  automatically  from  udev,
+          a simple rule like this one should do the trick (it does for me):
+                ACTION=="add", KERNEL=="controlC0", \
+                                RUN+="/usr/sbin/ldattach 19 /dev/ttyS3"
 
 config SND_OMAP_SOC_OSK5912
         tristate "SoC Audio support for omap osk5912"