diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:34 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:40 +0200 |
commit | 67ece13ffe862f9d17a144c6cd3feef88a57db13 (patch) | |
tree | ec2036681d19a9c10b2fad941eb8f58f9eafcfc8 /Documentation/networking/strparser.txt | |
parent | ALSA: pcm: Nuke snd_pcm_lib_mmap_vmalloc() (diff) | |
parent | vga_switcheroo: set audio client id according to bound GPU id (diff) | |
download | linux-67ece13ffe862f9d17a144c6cd3feef88a57db13.tar.xz linux-67ece13ffe862f9d17a144c6cd3feef88a57db13.zip |
Merge branch 'topic/vga_switcheroo' into for-next
Pull the vga_switcheroo audio client fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/networking/strparser.txt')
-rw-r--r-- | Documentation/networking/strparser.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/strparser.txt b/Documentation/networking/strparser.txt index 13081b3decef..a7d354ddda7b 100644 --- a/Documentation/networking/strparser.txt +++ b/Documentation/networking/strparser.txt @@ -48,7 +48,7 @@ void strp_pause(struct strparser *strp) Temporarily pause a stream parser. Message parsing is suspended and no new messages are delivered to the upper layer. -void strp_pause(struct strparser *strp) +void strp_unpause(struct strparser *strp) Unpause a paused stream parser. |