From 33cf44bb310708b5e56e01822aaf6cdeb31eb8f4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 21 Mar 2012 10:18:33 -0700 Subject: [PATCH] --- yaml --- r: 299107 b: refs/heads/master c: 099f5d01a6f73712e17552679aa724e021809a6e h: refs/heads/master i: 299105: 84ad7de53491c037582f2417cac697cacc592607 299103: 60e18ed579c1ba5fd1a213ed0df30894bb9e7253 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/Kconfig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 701d79f24801..9dd2c3b2e44a 100644 --- 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 index 08a3b1133d29..eb1dee26bda3 100644 --- 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