Merge branch 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[mv-sheeva.git] / drivers / staging / android / Kconfig

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 502c283eedcc030ec5cf6c5ad6d7d486c57ac6a4..6b996db0dd6a70daf8490f3229972eb2d3330202 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -7,8 +7,8 @@ config ANDROID
          Enable support for various drivers needed on the Android platform
 
 config ANDROID_BINDER_IPC
-       tristate "Android Binder IPC Driver"
-       default y
+       bool "Android Binder IPC Driver"
+       default n
 
 config ANDROID_LOGGER
        tristate "Android log driver"
@@ -77,4 +77,10 @@ config ANDROID_TIMED_GPIO
        depends on GENERIC_GPIO
        default n
 
+config ANDROID_LOW_MEMORY_KILLER
+       bool "Android Low Memory Killer"
+       default N
+       ---help---
+         Register processes to be killed when memory is low
+
 endmenu