diff options
-rw-r--r-- | arch/powerpc/kernel/rtas_pci.c | 4 | ||||
-rw-r--r-- | include/asm-powerpc/ppc-pci.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c index ace9f4c86e67..1616a44ac608 100644 --- a/arch/powerpc/kernel/rtas_pci.c +++ b/arch/powerpc/kernel/rtas_pci.c | |||
@@ -274,7 +274,7 @@ int __devinit rtas_setup_phb(struct pci_controller *phb) | |||
274 | return 0; | 274 | return 0; |
275 | } | 275 | } |
276 | 276 | ||
277 | unsigned long __init find_and_init_phbs(void) | 277 | void __init find_and_init_phbs(void) |
278 | { | 278 | { |
279 | struct device_node *node; | 279 | struct device_node *node; |
280 | struct pci_controller *phb; | 280 | struct pci_controller *phb; |
@@ -319,8 +319,6 @@ unsigned long __init find_and_init_phbs(void) | |||
319 | if (prop) | 319 | if (prop) |
320 | pci_assign_all_buses = *prop; | 320 | pci_assign_all_buses = *prop; |
321 | } | 321 | } |
322 | |||
323 | return 0; | ||
324 | } | 322 | } |
325 | 323 | ||
326 | /* RPA-specific bits for removing PHBs */ | 324 | /* RPA-specific bits for removing PHBs */ |
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h index 4a053404bf6b..f186720d0739 100644 --- a/include/asm-powerpc/ppc-pci.h +++ b/include/asm-powerpc/ppc-pci.h | |||
@@ -24,7 +24,7 @@ extern void pci_setup_phb_io_dynamic(struct pci_controller *hose, int primary); | |||
24 | extern struct list_head hose_list; | 24 | extern struct list_head hose_list; |
25 | extern int global_phb_number; | 25 | extern int global_phb_number; |
26 | 26 | ||
27 | extern unsigned long find_and_init_phbs(void); | 27 | extern void find_and_init_phbs(void); |
28 | 28 | ||
29 | extern struct pci_dev *ppc64_isabridge_dev; /* may be NULL if no ISA bus */ | 29 | extern struct pci_dev *ppc64_isabridge_dev; /* may be NULL if no ISA bus */ |
30 | 30 | ||