From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756591Ab2CURSp (ORCPT ); Wed, 21 Mar 2012 13:18:45 -0400 Received: from mail-ee0-f74.google.com ([74.125.83.74]:43428 "EHLO mail-ee0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756177Ab2CURSl (ORCPT ); Wed, 21 Mar 2012 13:18:41 -0400 From: Colin Cross To: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org Cc: Geert Uytterhoeven , John Stultz , Paul Gortmaker , Android Kernel Team , gregkh@linuxfoundation.org, Linus Torvalds , Colin Cross Subject: [PATCH] android: make persistent_ram based drivers depend on HAVE_MEMBLOCK Date: Wed, 21 Mar 2012 10:18:33 -0700 Message-Id: <1332350313-2501-1-git-send-email-ccross@android.com> X-Mailer: git-send-email 1.7.7.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reported-by: Paul Gortmaker Signed-off-by: Colin Cross --- drivers/staging/android/Kconfig | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) I can't test on m68k, but this disables the options if I remove HAVE_MEMBLOCK from arm. diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index 08a3b11..eb1dee2 100644 --- a/drivers/staging/android/Kconfig +++ b/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 -- 1.7.7.3