Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[linux-2.6-omap-h63xx.git] / arch / ppc / platforms / 4xx / cpci405.c

diff --git a/arch/ppc/platforms/4xx/cpci405.c b/arch/ppc/platforms/4xx/cpci405.c
index 367430998fc5a8864254b39635d24b044089f69c..2e7e25dd84cbc705b06e09d5533ab3139d5b908d 100644 (file)
--- a/arch/ppc/platforms/4xx/cpci405.c
+++ b/arch/ppc/platforms/4xx/cpci405.c
@@ -23,6 +23,7 @@
 #include <asm/todc.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 #include <asm/ocp.h>
 #include <asm/ibm_ocp_pci.h>
 #include <platforms/4xx/ibm405gp.h>
@@ -126,6 +127,7 @@ cpci405_setup_arch(void)
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
        unsigned int bar_response, bar;
 
        /* Disable region first */
@@ -167,6 +169,7 @@ bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
                                        PCI_FUNC(hose->first_busno), bar,
                                        &bar_response);
        }
+#endif
 }
 
 void __init