diff options
author | Kumar Gala <galak@freescale.com> | 2005-05-28 15:52:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-28 16:46:16 -0700 |
commit | 91f9855a7afbb160ba1709bf342858732138abad (patch) | |
tree | 4ba86cf1c44e95bc87621c15772c58b47aaf8087 /arch/ppc/platforms/85xx | |
parent | a6dbba77a9d4b47c60d60c4f07fa79b3ca93a1d5 (diff) | |
download | linux-3.10-91f9855a7afbb160ba1709bf342858732138abad.tar.gz linux-3.10-91f9855a7afbb160ba1709bf342858732138abad.tar.bz2 linux-3.10-91f9855a7afbb160ba1709bf342858732138abad.zip |
[PATCH] ppc32: Fix building MPC8555 CDS when CONFIG_PCI is disabled
The patch that introduced support for the VIA chipset broke building if
CONFIG_PCI is disabled.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/platforms/85xx')
-rw-r--r-- | arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c index c2a51273518..3ac0321eed0 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c @@ -439,9 +439,6 @@ mpc85xx_cds_setup_arch(void) printk("mpc85xx_cds_setup_arch\n"); - /* VIA IDE configuration */ - ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup; - #ifdef CONFIG_CPM2 cpm2_reset(); #endif @@ -462,6 +459,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 |