On Tue, Feb 21, 2006 at 11:44:15PM -0600, Kumar Gala wrote:
> On Fri, 17 Feb 2006, Dale Farnsworth wrote:
> 
> > From: Dale Farnsworth <dale at farnsworth.org>
> > 
> > Signed-off-by: Dale Farnsworth <dale at farnsworth.org>
> > ---
> 
> This change is already in the kernel tree.
> 
> - kumar

Indeed it is.  Sorry for the noise.

-Dale

> >  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
> > 

Reply via email to