From patchwork Mon Dec 22 21:34:25 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 15327 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 1140CDDEFB for ; Tue, 23 Dec 2008 08:45:54 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.177]) by ozlabs.org (Postfix) with ESMTP id 9D4D3DDE06; Tue, 23 Dec 2008 08:44:04 +1100 (EST) Received: from klappe.local (a89-182-74-139.net-htp.de [89.182.74.139]) by mrelayeu.kundenserver.de (node=mrelayeu6) with ESMTP (Nemesis) id 0ML29c-1LEsZF18TO-0007jN; Mon, 22 Dec 2008 22:44:01 +0100 Message-Id: <20081222214108.168571344@arndb.de> References: <20081222213424.234398861@arndb.de> In-Reply-To: <18765.58426.49381.986612@cargo.ozlabs.ibm.com> User-Agent: quilt/0.46-1 Date: Mon, 22 Dec 2008 22:34:25 +0100 From: arnd@arndb.de To: paulus@samba.org Subject: [patch 1/2] powerpc/cell: fix build breakage with CONFIG_SPUFS disabled Content-Disposition: inline; filename=0001-powerpc-cell-fix-build-breakage-with-CONFIG_SPUFS-d.patch X-Provags-ID: V01U2FsdGVkX19zRea+qrB4T/N4WxKF7Ezol/FJfSIds763WRD nAxpEG4auWcBCsMgIp9XjLI1kgww5f5fHBj7Y8DGbIXkPjZE6g XC2b4DTJXu28X7x/ktYbA== Cc: linuxppc-dev@ozlabs.org, cbe-oss-dev@ozlabs.org X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org CBE_THERM and OPROFILE_CELL both cannot be built without SPU_FS disabled, so make the dependency explicit. Reported-by: Milton Miller Signed-off-by: Arnd Bergmann --- arch/powerpc/platforms/cell/Kconfig | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig index c14d7d8..617f845 100644 --- a/arch/powerpc/platforms/cell/Kconfig +++ b/arch/powerpc/platforms/cell/Kconfig @@ -102,7 +102,7 @@ config PPC_IBM_CELL_POWERBUTTON config CBE_THERM tristate "CBE thermal support" default m - depends on CBE_RAS + depends on CBE_RAS && SPU_BASE config CBE_CPUFREQ tristate "CBE frequency scaling" @@ -136,5 +136,5 @@ endmenu config OPROFILE_CELL def_bool y - depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y) + depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y) && SPU_BASE