aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kernel-doc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-09-22 10:12:16 +0200
committerTakashi Iwai <tiwai@suse.de>2014-09-22 10:12:16 +0200
commit7639913f7298ed23a3f026ebcbb3b4e8850bcc39 (patch)
tree26f08f061535015b748a96106f4869560e3afc63 /scripts/kernel-doc
parentALSA: oxygen: set fifo_size (diff)
parentALSA: hda - Use standard hda_jack infrastructure for CA0132 driver (diff)
downloadlinux-7639913f7298ed23a3f026ebcbb3b4e8850bcc39.tar.gz
linux-7639913f7298ed23a3f026ebcbb3b4e8850bcc39.zip
Merge branch 'topic/hda-jack-rework' into for-next
This is a merge of rework of HD-audio jack event handling code. It extends the jack table to allow multiple callbacks.
Diffstat (limited to 'scripts/kernel-doc')
-rwxr-xr-xscripts/kernel-doc1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 16a07cfa4d34..70bea942b413 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -2085,6 +2085,7 @@ sub dump_function($$) {
$prototype =~ s/^noinline +//;
$prototype =~ s/__init +//;
$prototype =~ s/__init_or_module +//;
+ $prototype =~ s/__meminit +//;
$prototype =~ s/__must_check +//;
$prototype =~ s/__weak +//;
my $define = $prototype =~ s/^#\s*define\s+//; #ak added