Merge branch 'master' into for-next

[linux-2.6-block.git] / drivers / staging / android / Kconfig

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index b91c758883bf415162fcb9e67da5a5099ee69a58..b6b869261f32315a7061d7e99c48eabcdcc5065e 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -2,7 +2,6 @@ menu "Android"
 
 config ANDROID
        bool "Android Drivers"
-       default N
        ---help---
          Enable support for various drivers needed on the Android platform
 
@@ -60,7 +59,6 @@ config ANDROID_TIMED_GPIO
 
 config ANDROID_LOW_MEMORY_KILLER
        bool "Android Low Memory Killer"
-       default N
        ---help---
          Registers processes to be killed when memory is low