---

yaml --- r: 299107 b: refs/heads/master c: 099f5d0 h: refs/heads/master i: 299105: 84ad7de 299103: 60e18ed v: v3
git-mirror · Apr 10, 2012 · 33cf44b · 33cf44b
1 parent 12e7af0
commit 33cf44b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40f32d9345bee0b24d3317b498e79b02e4be27f4
+refs/heads/master: 099f5d01a6f73712e17552679aa724e021809a6e
diff --git a/trunk/drivers/staging/android/Kconfig b/trunk/drivers/staging/android/Kconfig
@@ -27,13 +27,14 @@ config ANDROID_LOGGER
 
 config ANDROID_PERSISTENT_RAM
 	bool
+	depends on HAVE_MEMBLOCK
 	select REED_SOLOMON
 	select REED_SOLOMON_ENC8
 	select REED_SOLOMON_DEC8
 
 config ANDROID_RAM_CONSOLE
 	bool "Android RAM buffer console"
-	depends on !S390 && !UML
+	depends on !S390 && !UML && HAVE_MEMBLOCK
 	select ANDROID_PERSISTENT_RAM
 	default n