aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/ppc-pci.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-19 04:46:04 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-19 04:46:04 -0500
commitf8ef2705969e0409efedeb889445da67806ba9ea (patch)
tree661acd5711b2bb662c659bb62adea116ce6d45f0 /include/asm-powerpc/ppc-pci.h
parent047ea7846565917c4a666635fa1fa4b5c587cd55 (diff)
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.h2
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);
48extern void pSeries_irq_bus_setup(struct pci_bus *bus); 48extern void pSeries_irq_bus_setup(struct pci_bus *bus);
49 49
50extern unsigned long pci_probe_only; 50extern unsigned long pci_probe_only;
51extern unsigned long pci_assign_all_buses;
52extern int pci_read_irq_line(struct pci_dev *pci_dev);
53 51
54/* ---- EEH internal-use-only related routines ---- */ 52/* ---- EEH internal-use-only related routines ---- */
55#ifdef CONFIG_EEH 53#ifdef CONFIG_EEH