Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / drivers / staging / android / Kconfig

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 9feb6ff0650566c308c36ec085d5b00f78ea8b2f..c0c95be0f969de825119ce2a6ee535fd6668a63b 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -22,7 +22,7 @@ config ANDROID_BINDER_IPC
 config ASHMEM
        bool "Enable the Anonymous Shared Memory Subsystem"
        default n
-       depends on SHMEM || TINY_SHMEM
+       depends on SHMEM
        ---help---
          The ashmem subsystem is a new shared memory allocator, similar to
          POSIX SHM but with different behavior and sporting a simpler
@@ -72,6 +72,33 @@ config ANDROID_INTF_ALARM_DEV
          elapsed realtime, and a non-wakeup alarm on the monotonic clock.
          Also exports the alarm interface to user-space.
 
+config SYNC
+       bool "Synchronization framework"
+       default n
+       select ANON_INODES
+       help
+         This option enables the framework for synchronization between multiple
+         drivers.  Sync implementations can take advantage of hardware
+         synchronization built into devices like GPUs.
+
+config SW_SYNC
+       bool "Software synchronization objects"
+       default n
+       depends on SYNC
+       help
+         A sync object driver that uses a 32bit counter to coordinate
+         syncrhronization.  Useful when there is no hardware primitive backing
+         the synchronization.
+
+config SW_SYNC_USER
+       bool "Userspace API for SW_SYNC"
+       default n
+       depends on SW_SYNC
+       help
+         Provides a user space API to the sw sync object.
+         *WARNING* improper use of this can result in deadlocking kernel
+         drivers from userspace.
+
 endif # if ANDROID
 
 endmenu