From ef2f0b9f2603e06eac63c4f92cec361674f8c852 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 28 Jul 2011 13:59:37 -0700
Subject: [PATCH] --- yaml --- r: 262885 b: refs/heads/master c:
 7b4785f45db2c124a6cbd73114e7e078a9251e0a h: refs/heads/master i:   262883:
 206e548f93738f2cc0527b89d0bdbd506e3b560a v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/solo6x10/p2m.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 843e0d0e86ac..0442491aa54d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd010235fd714571df587d0f14c70eebc6823973
+refs/heads/master: 7b4785f45db2c124a6cbd73114e7e078a9251e0a
diff --git a/trunk/drivers/staging/solo6x10/p2m.c b/trunk/drivers/staging/solo6x10/p2m.c
index 5717eabb04a4..56210f0fc5ec 100644
--- a/trunk/drivers/staging/solo6x10/p2m.c
+++ b/trunk/drivers/staging/solo6x10/p2m.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/scatterlist.h>
 #include "solo6x10.h"