staging: android-alarm: Disable Android alarm driver by default

[pandora-kernel.git] / drivers / staging / android / Kconfig

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index eb67563..99981fb 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -2,7 +2,6 @@ menu "Android"
 
 config ANDROID
        bool "Android Drivers"
-       depends on BROKEN
        default N
        ---help---
          Enable support for various drivers needed on the Android platform
@@ -13,12 +12,22 @@ config ANDROID_BINDER_IPC
        bool "Android Binder IPC Driver"
        default n
 
+config ASHMEM
+       bool "Enable the Anonymous Shared Memory Subsystem"
+       default n
+       depends on SHMEM || TINY_SHMEM
+       help
+         The ashmem subsystem is a new shared memory allocator, similar to
+         POSIX SHM but with different behavior and sporting a simpler
+         file-based API.
+
 config ANDROID_LOGGER
        tristate "Android log driver"
        default n
 
 config ANDROID_RAM_CONSOLE
        bool "Android RAM buffer console"
+       depends on !S390 && !UML
        default n
 
 config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE
@@ -91,6 +100,25 @@ config ANDROID_LOW_MEMORY_KILLER
        ---help---
          Register processes to be killed when memory is low
 
+source "drivers/staging/android/switch/Kconfig"
+
+config ANDROID_INTF_ALARM
+       bool "Android alarm driver"
+       depends on RTC_CLASS
+       default n
+       help
+         Provides non-wakeup and rtc backed wakeup alarms based on rtc or
+         elapsed realtime, and a non-wakeup alarm on the monotonic clock.
+         Also provides an interface to set the wall time which must be used
+         for elapsed realtime to work.
+
+config ANDROID_INTF_ALARM_DEV
+       bool "Android alarm device"
+       depends on ANDROID_INTF_ALARM
+       default y
+       help
+         Exports the alarm interface to user-space.
+
 endif # if ANDROID
 
 endmenu