summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/esi.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
commit4b4f887fb2780e39383c1f202b72f5a2780b2d4c (patch)
treee790d89c2612d2464ac00063dac677653f4ac9cb /arch/ia64/kernel/esi.c
parent6424db52e24e8cdf89917fa3c10395116440160e (diff)
parent76e7461a21dfe13565b2a323b53c8cc963541126 (diff)
downloadop-kernel-dev-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.zip
op-kernel-dev-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.tar.gz
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/ia64/kernel/esi.c')
-rw-r--r--arch/ia64/kernel/esi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/esi.c b/arch/ia64/kernel/esi.c
index d5764a3..b091111 100644
--- a/arch/ia64/kernel/esi.c
+++ b/arch/ia64/kernel/esi.c
@@ -84,7 +84,7 @@ static int __init esi_init (void)
case ESI_DESC_ENTRY_POINT:
break;
default:
- printk(KERN_WARNING "Unkown table type %d found in "
+ printk(KERN_WARNING "Unknown table type %d found in "
"ESI table, ignoring rest of table\n", *p);
return -ENODEV;
}
OpenPOWER on IntegriCloud