Commit bdabd2b4 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

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

From: Anton Blanchard <anton@samba.org>

Fix a compile error and a warning in the iSeries code, from Stephen Rothwell
parent cf74826d
...@@ -409,7 +409,7 @@ static int iSeries_Scan_Bridge_Slot(HvBusNumber Bus, ...@@ -409,7 +409,7 @@ static int iSeries_Scan_Bridge_Slot(HvBusNumber Bus,
iSeries_assign_IRQ(Irq, Bus, 0, EADsIdSel); iSeries_assign_IRQ(Irq, Bus, 0, EADsIdSel);
PPCDBG(PPCDBG_BUSWALK, PPCDBG(PPCDBG_BUSWALK,
"PCI:- allocate and assign IRQ 0x%02X.%02X.%02X = 0x%02X\n", "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. * Connect all functions of any device found.
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
extern void abort(void); extern void abort(void);
extern void ppcdbg_initialize(void); extern void ppcdbg_initialize(void);
extern void iSeries_pcibios_init(void); extern void iSeries_pcibios_init(void);
extern void tce_init_iSeries(void);
static void build_iSeries_Memory_Map(void); static void build_iSeries_Memory_Map(void);
static void setup_iSeries_cache_sizes(void); static void setup_iSeries_cache_sizes(void);
......
...@@ -289,6 +289,7 @@ static void __init pcibios_claim_one_bus(struct pci_bus *b) ...@@ -289,6 +289,7 @@ static void __init pcibios_claim_one_bus(struct pci_bus *b)
pcibios_claim_one_bus(child_bus); pcibios_claim_one_bus(child_bus);
} }
#ifndef CONFIG_PPC_ISERIES
static void __init pcibios_claim_of_setup(void) static void __init pcibios_claim_of_setup(void)
{ {
struct list_head *lb; struct list_head *lb;
...@@ -298,6 +299,7 @@ static void __init pcibios_claim_of_setup(void) ...@@ -298,6 +299,7 @@ static void __init pcibios_claim_of_setup(void)
pcibios_claim_one_bus(b); pcibios_claim_one_bus(b);
} }
} }
#endif
static int __init pcibios_init(void) static int __init pcibios_init(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment