projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-powerpc
/
ppc-pci.h
diff --git
a/include/asm-powerpc/ppc-pci.h
b/include/asm-powerpc/ppc-pci.h
index b847aa10074be1d87878a40acbece6bb204644eb..854ab713f56cb62b857216285d3b343c13e9ea66 100644
(file)
--- a/
include/asm-powerpc/ppc-pci.h
+++ b/
include/asm-powerpc/ppc-pci.h
@@
-22,7
+22,6
@@
extern void pci_setup_phb_io_dynamic(struct pci_controller *hose, int primary);
extern struct list_head hose_list;
extern struct list_head hose_list;
-extern int global_phb_number;
extern void find_and_init_phbs(void);
extern void find_and_init_phbs(void);
@@
-47,9
+46,6
@@
extern void init_pci_config_tokens (void);
extern unsigned long get_phb_buid (struct device_node *);
extern int rtas_setup_phb(struct pci_controller *phb);
extern unsigned long get_phb_buid (struct device_node *);
extern int rtas_setup_phb(struct pci_controller *phb);
-/* From iSeries PCI */
-extern void iSeries_pcibios_init(void);
-
extern unsigned long pci_probe_only;
/* ---- EEH internal-use-only related routines ---- */
extern unsigned long pci_probe_only;
/* ---- EEH internal-use-only related routines ---- */