diff options
Diffstat (limited to 'arch/ppc/kernel/prep_pci.c')
| -rw-r--r-- | arch/ppc/kernel/prep_pci.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/arch/ppc/kernel/prep_pci.c b/arch/ppc/kernel/prep_pci.c index 63a1e9ddf..78f207a54 100644 --- a/arch/ppc/kernel/prep_pci.c +++ b/arch/ppc/kernel/prep_pci.c @@ -1,5 +1,5 @@ /* - * $Id: prep_pci.c,v 1.35 1999/05/10 23:31:03 cort Exp $ + * $Id: prep_pci.c,v 1.39 1999/08/31 15:42:39 cort Exp $ * PReP pci functions. * Originally by Gary Thomas * rewritten and updated by Cort Dougan (cort@cs.nmt.edu) @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/openpic.h> +#include <asm/init.h> #include <asm/byteorder.h> #include <asm/io.h> #include <asm/ptrace.h> @@ -685,7 +686,7 @@ static u_char mvme2600_openpic_initsenses[] __initdata = { int prep_keybd_present = 1; int MotMPIC = 0; -__initfunc(int raven_init(void)) +int __init raven_init(void) { unsigned int devid; unsigned int pci_membase; @@ -788,7 +789,7 @@ struct mot_info { {0x000, 0x00, 0x00, "", NULL, NULL} }; -__initfunc(unsigned long prep_route_pci_interrupts(void)) +unsigned long __init prep_route_pci_interrupts(void) { unsigned char *ibc_pirq = (unsigned char *)0x80800860; unsigned char *ibc_pcicon = (unsigned char *)0x80800840; @@ -976,9 +977,8 @@ __initfunc(unsigned long prep_route_pci_interrupts(void)) return 0; } -__initfunc( -void -prep_pcibios_fixup(void)) +void __init +prep_pcibios_fixup(void) { struct pci_dev *dev; extern unsigned char *Motherboard_map; @@ -1017,17 +1017,17 @@ prep_pcibios_fixup(void)) for ( i = 0 ; i <= 5 ; i++ ) { - if ( dev->base_address[i] > 0x10000000 ) + if ( dev->resource[i].start > 0x10000000 ) { printk("Relocating PCI address %lx -> %lx\n", - dev->base_address[i], - (dev->base_address[i] & 0x00FFFFFF) + dev->resource[i].start, + (dev->resource[i].start & 0x00FFFFFF) | 0x01000000); - dev->base_address[i] = - (dev->base_address[i] & 0x00FFFFFF) | 0x01000000; + dev->resource[i].start = + (dev->resource[i].start & 0x00FFFFFF) | 0x01000000; pci_write_config_dword(dev, PCI_BASE_ADDRESS_0+(i*0x4), - dev->base_address[i] ); + dev->resource[i].start ); } } #if 0 @@ -1044,9 +1044,8 @@ prep_pcibios_fixup(void)) decl_config_access_method(indirect); -__initfunc( -void -prep_setup_pci_ptrs(void)) +void __init +prep_setup_pci_ptrs(void) { PPC_DEVICE *hostbridge; @@ -1055,7 +1054,7 @@ prep_setup_pci_ptrs(void)) { pci_config_address = (unsigned *)0x80000cf8; pci_config_data = (char *)0x80000cfc; - set_config_access_method(indirect); + set_config_access_method(indirect); } else { |