summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorColin Cross2010-04-16 00:21:51 +0200
committerGreg Kroah-Hartman2011-11-30 12:30:14 +0100
commitc11a166cd4c19664355e0e3d9c04cfa7ee4aa9f4 (patch)
tree6118ea20df9516439ce999fa0d618411feff447e /drivers/staging/android
parentandroid-common: include linux/slab.h (diff)
downloadkernel-qcow2-linux-c11a166cd4c19664355e0e3d9c04cfa7ee4aa9f4.tar.gz
kernel-qcow2-linux-c11a166cd4c19664355e0e3d9c04cfa7ee4aa9f4.tar.xz
kernel-qcow2-linux-c11a166cd4c19664355e0e3d9c04cfa7ee4aa9f4.zip
android-common: Fix slab.h includes for 2.6.34-rc4
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/binder.c1
-rw-r--r--drivers/staging/android/logger.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 99010d4b3044..3aec45301eb3 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -31,6 +31,7 @@
#include <linux/sched.h>
#include <linux/uaccess.h>
#include <linux/vmalloc.h>
+#include <linux/slab.h>
#include "binder.h"
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 64cc2a1e7b16..dd765649c03d 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -23,6 +23,7 @@
#include <linux/miscdevice.h>
#include <linux/uaccess.h>
#include <linux/poll.h>
+#include <linux/slab.h>
#include <linux/time.h>
#include "logger.h"