summaryrefslogtreecommitdiffstats
path: root/lib/842
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-18 05:38:27 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-18 05:38:27 +0100
commit49dc2b7173010792c6923930ffcee84b7094b7de (patch)
tree439899abc82e7413b3bee6d52823d5350d7f2245 /lib/842
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff)
parentdrivers/rtc: broken link fix (diff)
downloadlinux-49dc2b7173010792c6923930ffcee84b7094b7de.tar.xz
linux-49dc2b7173010792c6923930ffcee84b7094b7de.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: drivers/rtc: broken link fix drm/i915 Fix typos in i915_gem_fence.c Docs: fix missing word in REPORTING-BUGS lib+mm: fix few spelling mistakes MAINTAINERS: add git URL for APM driver treewide: Fix typo in printk
Diffstat (limited to 'lib/842')
-rw-r--r--lib/842/842_decompress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/842/842_decompress.c b/lib/842/842_decompress.c
index a7f278d2ed8f..11fc39b4032b 100644
--- a/lib/842/842_decompress.c
+++ b/lib/842/842_decompress.c
@@ -254,7 +254,7 @@ static int do_op(struct sw842_param *p, u8 o)
case OP_ACTION_NOOP:
break;
default:
- pr_err("Interal error, invalid op %x\n", op);
+ pr_err("Internal error, invalid op %x\n", op);
return -EINVAL;
}