Remove Android oom killer due to FTBFS

CC      drivers/staging/android/lowmemorykiller.o
drivers/staging/android/lowmemorykiller.c: In function 'lowmem_shrink':
drivers/staging/android/lowmemorykiller.c:108: error: 'struct mm_struct' has no member named 'oom_adj'
make[5]: *** [drivers/staging/android/lowmemorykiller.o] Error 1
make[4]: *** [drivers/staging/android] Error 2
make[3]: *** [drivers/staging] Error 2
make[2]: *** [drivers] Error 2
make[2]: Leaving directory `/home/zblaxell/linux/linux-source-2.6.31-zb64-zb2009091016'
make[1]: *** [debian/stamp/build/kernel] Error 2
make[1]: Leaving directory `/home/zblaxell/linux/linux-source-2.6.31-zb64-zb2009091016'
make: *** [debian/stamp/do-build-arch] Error 2
(cherry picked from commit 10ddd07115ce01e37402a8eabad5646db904c77c)

diff --git a/.config b/.config
index 83e409526df959f53be780c8a1cf7874526e3036..f652162821289a8942556063515ace2f26c9c96c 100644 (file)
--- a/.config
+++ b/.config
@@ -4290,7 +4290,7 @@ CONFIG_ANDROID_RAM_CONSOLE_EARLY_ADDR=0x0
 CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE=0x0
 CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID_TIMED_GPIO=m
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 CONFIG_DST=m
 # CONFIG_DST_DEBUG is not set
 CONFIG_POHMELFS=m