patch-2.4.0-test9 linux/include/asm-ppc/machdep.h

• Lines: 18
• Date: Sun Sep 17 09:48:08 2000
• Orig file: v2.4.0-test8/linux/include/asm-ppc/machdep.h
• Orig date: Tue Jul 18 23:02:09 2000

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-ppc/machdep.h linux/include/asm-ppc/machdep.h
@@ -31,7 +31,7 @@
 	void		(*power_off)(void);
 	void		(*halt)(void);
 
-	void		(*time_init)(void); /* Optional, may be NULL */
+	long		(*time_init)(void); /* Optional, may be NULL */
 	int		(*set_rtc_time)(unsigned long nowtime);
 	unsigned long	(*get_rtc_time)(void);
 	void		(*calibrate_decr)(void);
@@ -75,7 +75,7 @@
 	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_io_base)(unsigned char bus, unsigned char devfn, int physical);
 	void* (*pci_dev_mem_base)(unsigned char bus, unsigned char devfn);
 	int (*pci_dev_root_bridge)(unsigned char bus, unsigned char devfn);