diff --git a/[refs] b/[refs]
index f902b131550b..6d85233f15a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4a67bb2e2ac02fbcd3d1c780bbf7200eeb2a76d
+refs/heads/master: 2c0fb1c969ddedf15b4d9d0c106f4dca82dffc21
diff --git a/trunk/drivers/staging/android/Kconfig b/trunk/drivers/staging/android/Kconfig
index cc406cc8b8d1..9f61d46da157 100644
--- a/trunk/drivers/staging/android/Kconfig
+++ b/trunk/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