[PATCH] ppc64: Fix a compile error and a warning in the iSeries code, from Stephen...

From: Anton Blanchard <anton@samba.org>

Fix a compile error and a warning in the iSeries code, from Stephen Rothwell

diff --git a/arch/ppc64/kernel/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c
index 7e5ee284418c488396418edf8d3f77fea432cdde..f5bc53b3a8d71fa3882672c9a86bd7d141f3a3f0 100644 (file)
--- a/arch/ppc64/kernel/iSeries_pci.c
+++ b/arch/ppc64/kernel/iSeries_pci.c
@@ -409,7 +409,7 @@ static int iSeries_Scan_Bridge_Slot(HvBusNumber Bus,
        iSeries_assign_IRQ(Irq, Bus, 0, EADsIdSel);
        PPCDBG(PPCDBG_BUSWALK,
                "PCI:- allocate and assign IRQ 0x%02X.%02X.%02X = 0x%02X\n",
-               Bus, 0, AgentId, Irq);
+               Bus, 0, EADsIdSel, Irq);
 
        /*
         * Connect all functions of any device found.  

diff --git a/arch/ppc64/kernel/iSeries_setup.c b/arch/ppc64/kernel/iSeries_setup.c
index 35617a952c98fc1ca45fd37b0676a968169277c2..bf234f5ec4ce46632a28b059023612d204331aff 100644 (file)
--- a/arch/ppc64/kernel/iSeries_setup.c
+++ b/arch/ppc64/kernel/iSeries_setup.c
@@ -58,6 +58,7 @@
 extern void abort(void);
 extern void ppcdbg_initialize(void);
 extern void iSeries_pcibios_init(void);
+extern void tce_init_iSeries(void);
 
 static void build_iSeries_Memory_Map(void);
 static void setup_iSeries_cache_sizes(void);

diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index 147dc23d14cb23ec976c48511b69f618055fbfb1..2dc7b69b84265393aa293d5b80fef0232ec7ef4e 100644 (file)
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -289,6 +289,7 @@ static void __init pcibios_claim_one_bus(struct pci_bus *b)
                pcibios_claim_one_bus(child_bus);
 }
 
+#ifndef CONFIG_PPC_ISERIES
 static void __init pcibios_claim_of_setup(void)
 {
        struct list_head *lb;
@@ -298,6 +299,7 @@ static void __init pcibios_claim_of_setup(void)
                pcibios_claim_one_bus(b);
        }
 }
+#endif
 
 static int __init pcibios_init(void)
 {