Merge branch 'for-linus' into next

[pandora-kernel.git] / drivers / input / mouse / alps.c

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 2a791e0..0d22cb9 100644 (file)
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -15,6 +15,7 @@
  * the Free Software Foundation.
  */
 
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/serio.h>
 #include <linux/libps2.h>