aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-12-05 08:44:33 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-05 08:44:33 -0600
commitcac1e30af72c4cf289750193426ebd5d2b6bd1d5 (patch)
treeeb37cda0433cc28f3455bcd2a525707963517dde /scripts
parent01e7a53aed945adafc3ee54e2159227839daf0b4 (diff)
parent07f35073c6d6d1b2f42a6b3671b8af2f271986b9 (diff)
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 04ab990cc0..cce8f86251 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1901,7 +1901,7 @@ sub process {
# printk should use KERN_* levels. Note that follow on printk's on the
# same line do not need a level, so we use the current block context
# to try and find and validate the current printk. In summary the current
-# printk includes all preceeding printk's which have no newline on the end.
+# printk includes all preceding printk's which have no newline on the end.
# we assume the first bad printk is the one to report.
if ($line =~ /\bprintk\((?!KERN_)\s*"/) {
my $ok = 0;