* ppc32: mpc85xx: set pcibios_fixup only #ifdef CONFIG_PCI
@ 2006-02-17 23:37 Dale Farnsworth
2006-02-22 5:44 ` Kumar Gala
0 siblings, 1 reply; 3+ messages in thread
From: Dale Farnsworth @ 2006-02-17 23:37 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-embedded
From: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: ppc32: mpc85xx: set pcibios_fixup only #ifdef CONFIG_PCI
2006-02-17 23:37 ppc32: mpc85xx: set pcibios_fixup only #ifdef CONFIG_PCI Dale Farnsworth
@ 2006-02-22 5:44 ` Kumar Gala
2006-02-22 14:03 ` Dale Farnsworth
0 siblings, 1 reply; 3+ messages in thread
From: Kumar Gala @ 2006-02-22 5:44 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: linuxppc-embedded
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: ppc32: mpc85xx: set pcibios_fixup only #ifdef CONFIG_PCI
2006-02-22 5:44 ` Kumar Gala
@ 2006-02-22 14:03 ` Dale Farnsworth
0 siblings, 0 replies; 3+ messages in thread
From: Dale Farnsworth @ 2006-02-22 14:03 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-embedded
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@farnsworth.org>
> >
> > Signed-off-by: Dale Farnsworth <dale@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
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-02-22 14:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-02-17 23:37 ppc32: mpc85xx: set pcibios_fixup only #ifdef CONFIG_PCI Dale Farnsworth
2006-02-22 5:44 ` Kumar Gala
2006-02-22 14:03 ` Dale Farnsworth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).