diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/ppc/kernel/mbx_pci.c | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'arch/ppc/kernel/mbx_pci.c')
-rw-r--r-- | arch/ppc/kernel/mbx_pci.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/ppc/kernel/mbx_pci.c b/arch/ppc/kernel/mbx_pci.c index 5114c3cfb..d7473e128 100644 --- a/arch/ppc/kernel/mbx_pci.c +++ b/arch/ppc/kernel/mbx_pci.c @@ -253,16 +253,14 @@ int mbx_pcibios_find_class(unsigned int class_code, unsigned short index, return PCIBIOS_DEVICE_NOT_FOUND; } -__initfunc( -void -mbx_pcibios_fixup(void)) +void __init +mbx_pcibios_fixup(void) { /* Nothing to do here? */ } -__initfunc( -void -mbx_setup_pci_ptrs(void)) +void __init +mbx_setup_pci_ptrs(void) { set_config_access_method(mbx); |