diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 00:41:18 -0500 |
commit | 98a5d024eb589a863c1c79f3c3f8ecb666c0eec9 (patch) | |
tree | 456799ad9fce41cdb2186ba3872c7a077ec3bd05 /include/asm-powerpc/ppc-pci.h | |
parent | d67e7ebb2a15bf0429c55f2fc1c4b02808367874 (diff) | |
parent | 1b15688b31d8c88881102426279e8cc03953860b (diff) | |
download | talos-op-linux-98a5d024eb589a863c1c79f3c3f8ecb666c0eec9.tar.gz talos-op-linux-98a5d024eb589a863c1c79f3c3f8ecb666c0eec9.zip |
Merge branch 'upstream'
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 |