From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id 8551867D85 for ; Fri, 3 Nov 2006 09:35:25 +1100 (EST) Subject: Re: [patch 14/16] powerpc: make initialization of OF hooks dependent on PPC_OF From: Benjamin Herrenschmidt To: s.hauer@pengutronix.de In-Reply-To: <20061102125629.771962000@localhost.localdomain> References: <20061102125555.252338000@localhost.localdomain> <20061102125629.771962000@localhost.localdomain> Content-Type: text/plain Date: Fri, 03 Nov 2006 09:35:17 +1100 Message-Id: <1162506917.10630.57.camel@localhost.localdomain> Mime-Version: 1.0 Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote: > plain text document attachment > (powerpc-head_32.S-remove-MULTIPLATFORM.diff) > Make initialization of OF hooks dependent on PPC_OF, not on MULTIPLATFORM > > Signed-off-by: Sascha Hauer Acked-by: Benjamin Herrenschmidt Though see my comment about your previous patch... In fact, they could be one patch since things might not work/build if you only apply one of them. So 13 and 14 should be folded into one. > Index: arch/powerpc/kernel/head_32.S > =================================================================== > --- a/arch/powerpc/kernel/head_32.S.orig > +++ b/arch/powerpc/kernel/head_32.S > @@ -119,7 +119,7 @@ __start: > * because OF may have I/O devices mapped into that area > * (particularly on CHRP). > */ > -#ifdef CONFIG_PPC_MULTIPLATFORM > +#ifdef CONFIG_PPC_OF > cmpwi 0,r5,0 > beq 1f > bl prom_init > > -- > Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de > Pengutronix - Linux Solutions for Science and Industry > Handelsregister: Amtsgericht Hildesheim, HRA 2686 > Hannoversche Str. 2, 31134 Hildesheim, Germany > Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9 > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@ozlabs.org > https://ozlabs.org/mailman/listinfo/linuxppc-dev