From: Andrew Morton Signed-off-by: Andrew Morton --- Documentation/sound/alsa/ALSA-Configuration.txt | 4 ---- 1 file changed, 4 deletions(-) diff -puN Documentation/sound/alsa/ALSA-Configuration.txt~git-alsa-fixup Documentation/sound/alsa/ALSA-Configuration.txt --- a/Documentation/sound/alsa/ALSA-Configuration.txt~git-alsa-fixup +++ a/Documentation/sound/alsa/ALSA-Configuration.txt @@ -753,11 +753,7 @@ Prior to version 0.9.0rc4 options had a position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size) single_cmd - Use single immediate commands to communicate with codecs (for debugging only) -<<<<<<< HEAD/Documentation/sound/alsa/ALSA-Configuration.txt enable_msi - Enable Message Signaled Interrupt (MSI) (default = off) -======= - enable_msi - Enable Message Signaled Interrupt (MSI) (default = off) ->>>>>>> /Documentation/sound/alsa/ALSA-Configuration.txt This module supports one card and autoprobe. _