diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-19 22:54:57 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 00:18:11 -0500 |
commit | 549beb9ba3b03345cbd8e1233825d5b197a3f9f7 (patch) | |
tree | c192ba6cdfa13e9888d9e5f534d2862127d412cb /arch/powerpc/platforms/powermac/pmac.h | |
parent | 24f8c827f9b8ab2c8644f7ab85a1b1d58fc0fcf7 (diff) |
[POWERPC] Merge 32 and 64 bits pcibios_enable_device
This merge the two implementations, based on the previously
fixed up 32 bits one. The pcibios_enable_device_hook in ppc_md
is now available for ppc64 use. Also remove the new unused
"initial" parameter from it and fixup users.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h index fcde070f7054..b3abaaf61eb4 100644 --- a/arch/powerpc/platforms/powermac/pmac.h +++ b/arch/powerpc/platforms/powermac/pmac.h | |||
@@ -26,7 +26,7 @@ extern void pmac_pci_init(void); | |||
26 | extern void pmac_nvram_update(void); | 26 | extern void pmac_nvram_update(void); |
27 | extern unsigned char pmac_nvram_read_byte(int addr); | 27 | extern unsigned char pmac_nvram_read_byte(int addr); |
28 | extern void pmac_nvram_write_byte(int addr, unsigned char val); | 28 | extern void pmac_nvram_write_byte(int addr, unsigned char val); |
29 | extern int pmac_pci_enable_device_hook(struct pci_dev *dev, int initial); | 29 | extern int pmac_pci_enable_device_hook(struct pci_dev *dev); |
30 | extern void pmac_pcibios_after_init(void); | 30 | extern void pmac_pcibios_after_init(void); |
31 | extern int of_show_percpuinfo(struct seq_file *m, int i); | 31 | extern int of_show_percpuinfo(struct seq_file *m, int i); |
32 | 32 | ||