Merge branch 'topic/snd-printk' into for-linus

* topic/snd-printk:
  ALSA: Fixed a typo of printk()
  ALSA: Add debug module option
  ALSA: core - strip too long file names in snd_print*()

1 files changed, 6 insertions, 0 deletions

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index ad51c93d41e4..1c8eb4518ce0 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -60,6 +60,12 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     slots       - Reserve the slot index for the given driver.
                   This option takes multiple strings.           
                   See "Module Autoloading Support" section for details.
+    debug       - Specifies the debug message level
+                  (0 = disable debug prints, 1 = normal debug messages,
+                   2 = verbose debug messages)
+                  This option appears only when CONFIG_SND_DEBUG=y.
+                  This option can be dynamically changed via sysfs
+                  /sys/modules/snd/parameters/debug file.
   
   Module snd-pcm-oss
   ------------------