summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/powermac/pmac.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-22 10:02:39 +0400
committerPaul Mackerras <paulus@samba.org>2005-10-22 10:02:39 +0400
commit35499c0195e46f479cf6ac16ad8d3f394b5fcc10 (patch)
tree25660acd2425de5236a1eff7a25dc931e6f86492 /arch/powerpc/platforms/powermac/pmac.h
parentb6ba92819dc1304a4e5a0bf06b297c657b58168a (diff)
downloadlinux-35499c0195e46f479cf6ac16ad8d3f394b5fcc10.tar.xz
powerpc: Merge in 64-bit powermac support.
This brings in a lot of changes from arch/ppc64/kernel/pmac_*.c to arch/powerpc/platforms/powermac/*.c and makes various minor tweaks elsewhere. On the powermac we now initialize ppc_md by copying the whole pmac_md structure into it, which required some changes in the ordering of initializations of individual fields of it. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/pmac.h')
-rw-r--r--arch/powerpc/platforms/powermac/pmac.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h
index 0a9ba704865e..2ad25e13423e 100644
--- a/arch/powerpc/platforms/powermac/pmac.h
+++ b/arch/powerpc/platforms/powermac/pmac.h
@@ -19,7 +19,7 @@ extern int pmac_set_rtc_time(struct rtc_time *);
extern void pmac_read_rtc_time(void);
extern void pmac_calibrate_decr(void);
extern void pmac_pcibios_fixup(void);
-extern void pmac_find_bridges(void);
+extern void pmac_pci_init(void);
extern unsigned long pmac_ide_get_base(int index);
extern void pmac_ide_init_hwif_ports(hw_regs_t *hw,
unsigned long data_port, unsigned long ctrl_port, int *irq);
@@ -41,7 +41,7 @@ extern unsigned long pmac_ide_get_base(int index);
extern void pmac_ide_init_hwif_ports(hw_regs_t *hw,
unsigned long data_port, unsigned long ctrl_port, int *irq);
-extern void pmac_nvram_init(void);
+extern int pmac_nvram_init(void);
extern struct hw_interrupt_type pmac_pic;