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

[safe/jmp/linux-2.6] / drivers / input / serio / i8042.c

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 90e5668..6440a8f 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -21,6 +21,7 @@
 #include <linux/rcupdate.h>
 #include <linux/platform_device.h>
 #include <linux/i8042.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 
@@ -430,7 +431,7 @@ static bool i8042_filter(unsigned char data, unsigned char str,
        }
 
        if (i8042_platform_filter && i8042_platform_filter(data, str, serio)) {
-               dbg("Filtered out by platfrom filter\n");
+               dbg("Filtered out by platform filter\n");
                return true;
        }