Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linus

[~andy/linux] / arch / x86 / kernel / cpu / mkcapflags.pl

diff --git a/arch/x86/kernel/cpu/mkcapflags.pl b/arch/x86/kernel/cpu/mkcapflags.pl
index 0c5b54919c7bbf2f196a9a1c7966c2d50fa3a0a7..c7b3fe2d72e0f71b94577fde23622a8797eca941 100644 (file)
--- a/arch/x86/kernel/cpu/mkcapflags.pl
+++ b/arch/x86/kernel/cpu/mkcapflags.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 #
 # Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h
 #
@@ -29,7 +29,7 @@ while (defined($line = <IN>)) {
                        print STDERR "$in: duplicate feature name: $feature\n";
                        $err++;
                }
-               printf OUT "\t%-32s = \"%s\",%s\n", "[$macro]", $feature;
+               printf OUT "\t%-32s = \"%s\",\n", "[$macro]", $feature;
        }
 }
 print OUT "};\n";