Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.

The IP22 cache bugs which are plaguing some machines are still unfixed.

1 files changed, 5 insertions, 0 deletions

diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h
index 5e7b1b578..108004ae2 100644
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -74,6 +74,11 @@ struct machdep_calls {
 		unsigned char dev_fn, unsigned char offset, unsigned int val);
 	void (*pcibios_fixup)(void);
 	void (*pcibios_fixup_bus)(struct pci_bus *);
+
+	void* (*pci_dev_io_base)(unsigned char bus, unsigned char devfn);
+	void* (*pci_dev_mem_base)(unsigned char bus, unsigned char devfn);
+	int (*pci_dev_root_bridge)(unsigned char bus, unsigned char devfn);
+
 	/* this is for modules, since _machine can be a define -- Cort */
 	int ppc_machine;
 };