summaryrefslogtreecommitdiff
path: root/drivers/staging/android/lowmemorykiller.c
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-06-04 19:46:24 +0800
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-06-04 19:46:24 +0800
commit29a3e1ef73daaa91cbf5cce2fb475f1878254402 (patch)
treefbd1df992706a4786633a7986a31b9cf78b3dced /drivers/staging/android/lowmemorykiller.c
parent564119271649aa2d1840e79badf743e957b497e6 (diff)
parent3c16bd7bb0a2b00b71f65bb0075e0c94d0fcc777 (diff)
Merge Linaro Android branch ' jstultz/linaro-android-3.4
' into integration-android-ux500 Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/staging/android/lowmemorykiller.c')
-rw-r--r--drivers/staging/android/lowmemorykiller.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index b91e4bc332a..e73caf170aa 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -36,7 +36,6 @@
#include <linux/oom.h>
#include <linux/sched.h>
#include <linux/rcupdate.h>
-#include <linux/profile.h>
#include <linux/notifier.h>
static uint32_t lowmem_debug_level = 2;