android: make persistent_ram based drivers depend on HAVE_MEMBLOCK
authorColin Cross <ccross@android.com>
Wed, 21 Mar 2012 17:18:33 +0000 (10:18 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Apr 2012 16:48:29 +0000 (09:48 -0700)
m68k doesn't have memblock_reserve, which causes a build failure
with allmodconfig.  Make PERSISTENT_RAM and RAM_CONSOLE depend on
HAVE_MEMBLOCK.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/Kconfig

index 08a3b1133d29ed476ed21e99a3a75d39a74cda3d..eb1dee26bda3662972d9e9e6e4595402ba775ee5 100644 (file)
@@ -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