From dd5d24aeb770f4772a6bac6aa1748f8308dd2456 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Nov 2005 11:04:55 +0100 Subject: [PATCH] --- yaml --- r: 15949 b: refs/heads/master c: 10e4097fb47b57d095204d3fad10b25e3b4d42a3 h: refs/heads/master i: 15947: c91ab20c3aee4ecd397da910707196076c5ea53b v: v3 --- [refs] | 2 +- trunk/Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc6e2f8085ac..1ab44a20591a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba7301c7d985d206a5688c69d0a74de3988f6d6c +refs/heads/master: 10e4097fb47b57d095204d3fad10b25e3b4d42a3 diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 23d1870d522f..84068baf587b 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1481,7 +1481,7 @@ the proper value with this option. The following strings are accepted: - default Don't override the default setting - - disable Disable the quirk + - none Disable the quirk - hp_only Bind Master and Headphone controls as a single control - swap_hp Swap headphone and master controls - swap_surround Swap master and surround controls