Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[deliverable/linux.git] / drivers / parisc / eisa_enumerator.c

diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c
index caa1531337540dec37c71d6865da922702e9bf3d..a656d9e8334302c2ec4f013ad6c016034ace5f27 100644 (file)
--- a/drivers/parisc/eisa_enumerator.c
+++ b/drivers/parisc/eisa_enumerator.c
@@ -357,7 +357,7 @@ static int parse_slot_config(int slot,
                }
                if (flags & HPEE_FUNCTION_INFO_CFG_FREE_FORM) {
                        /* I have no idea how to handle this */
-                       printk("function %d have free-form confgiuration, skipping ",
+                       printk("function %d have free-form configuration, skipping ",
                                num_func);
                        pos = p0 + function_len;
                        continue;