From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <galak@kernel.crashing.org>
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 8B32667A03
	for <linuxppc-embedded@ozlabs.org>;
	Wed, 22 Feb 2006 16:54:24 +1100 (EST)
Date: Tue, 21 Feb 2006 23:44:15 -0600 (CST)
From: Kumar Gala <galak@kernel.crashing.org>
To: Dale Farnsworth <dale@farnsworth.org>
Subject: Re: ppc32: mpc85xx: set pcibios_fixup only #ifdef CONFIG_PCI
In-Reply-To: <20060217233733.GA30701@xyzzy.farnsworth.org>
Message-ID: <Pine.LNX.4.44.0602212343400.2878-100000@gate.crashing.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: linuxppc-embedded@ozlabs.org
List-Id: Linux on Embedded PowerPC Developers Mail List
	<linuxppc-embedded.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-embedded>,
	<mailto:linuxppc-embedded-request@ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-embedded>
List-Post: <mailto:linuxppc-embedded@ozlabs.org>
List-Help: <mailto:linuxppc-embedded-request@ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-embedded>,
	<mailto:linuxppc-embedded-request@ozlabs.org?subject=subscribe>

On Fri, 17 Feb 2006, Dale Farnsworth wrote:

> From: Dale Farnsworth <dale@farnsworth.org>
> 
> Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
> ---

This change is already in the kernel tree.

- kumar


> 
>  arch/ppc/platforms/85xx/mpc85xx_cds_common.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> Index: linux-2.6.10/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
> ===================================================================
> --- linux-2.6.10.orig/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
> +++ linux-2.6.10/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
> @@ -456,9 +456,6 @@ mpc85xx_cds_setup_arch(void)
>  	mtspr(SPRN_DBCR0, (DBCR0_IDM));
>  	mtspr(SPRN_DBSR, 0xffffffff);
>  #endif
> -
> - 	/* VIA IDE configuration */
> -         ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
>   
>  #ifdef CONFIG_CPM2
>  	cpm2_reset();
> @@ -480,6 +477,9 @@ mpc85xx_cds_setup_arch(void)
>          loops_per_jiffy = freq / HZ;
>  
>  #ifdef CONFIG_PCI
> + 	/* VIA IDE configuration */
> +         ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
> +
>          /* setup PCI host bridges */
>          mpc85xx_setup_hose();
>  #endif
>