diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-19 20:46:04 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-19 20:46:04 +1100 |
commit | f8ef2705969e0409efedeb889445da67806ba9ea (patch) | |
tree | 661acd5711b2bb662c659bb62adea116ce6d45f0 /include/asm-powerpc/ppc-pci.h | |
parent | 047ea7846565917c4a666635fa1fa4b5c587cd55 (diff) | |
download | blackbird-op-linux-f8ef2705969e0409efedeb889445da67806ba9ea.tar.gz blackbird-op-linux-f8ef2705969e0409efedeb889445da67806ba9ea.zip |
powerpc: Merge pci.h
This involves some minor changes: a few unused functions that the
ppc32 pci.c provides are no longer declared here or exported;
pcibios_assign_all_busses now just refers to the pci_assign_all_buses
variable on both 32-bit and 64-bit; pcibios_scan_all_fns is now
just 0 instead of a function that always returns 0 on 64-bit.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/ppc-pci.h')
-rw-r--r-- | include/asm-powerpc/ppc-pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h index 2e36e5a7f4f3..36cdc869e580 100644 --- a/include/asm-powerpc/ppc-pci.h +++ b/include/asm-powerpc/ppc-pci.h @@ -48,8 +48,6 @@ extern void pSeries_final_fixup(void); extern void pSeries_irq_bus_setup(struct pci_bus *bus); extern unsigned long pci_probe_only; -extern unsigned long pci_assign_all_buses; -extern int pci_read_irq_line(struct pci_dev *pci_dev); /* ---- EEH internal-use-only related routines ---- */ #ifdef CONFIG_EEH |