diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
| commit | 16b5d462f73eb29d1f67fa01cc1ea66afdc72569 (patch) | |
| tree | 5407bd573f4840e473ea27cbe61e5c7a07131fcd /arch/alpha/kernel/sys_ruffian.c | |
| parent | ce8a076e11e7e5ee36007f9a3eee5bb3744cb8f6 (diff) | |
Merge with Linux 2.3.99-pre2.
Diffstat (limited to 'arch/alpha/kernel/sys_ruffian.c')
| -rw-r--r-- | arch/alpha/kernel/sys_ruffian.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/alpha/kernel/sys_ruffian.c b/arch/alpha/kernel/sys_ruffian.c index 01d80ab97..23069e06d 100644 --- a/arch/alpha/kernel/sys_ruffian.c +++ b/arch/alpha/kernel/sys_ruffian.c @@ -3,7 +3,7 @@ * * Copyright (C) 1995 David A Rusling * Copyright (C) 1996 Jay A Estabrook - * Copyright (C) 1998, 1999 Richard Henderson + * Copyright (C) 1998, 1999, 2000 Richard Henderson * * Code supporting the RUFFIAN. */ @@ -23,7 +23,7 @@ #include <asm/mmu_context.h> #include <asm/io.h> #include <asm/pgtable.h> -#include <asm/core_pyxis.h> +#include <asm/core_cia.h> #include "proto.h" #include "irq_impl.h" @@ -149,8 +149,8 @@ struct alpha_machine_vector ruffian_mv __initmv = { DO_EV5_MMU, DO_DEFAULT_RTC, DO_PYXIS_IO, - DO_PYXIS_BUS, - machine_check: pyxis_machine_check, + DO_CIA_BUS, + machine_check: cia_machine_check, max_dma_address: ALPHA_RUFFIAN_MAX_DMA_ADDRESS, min_io_address: DEFAULT_IO_BASE, min_mem_address: DEFAULT_MEM_BASE, @@ -161,7 +161,7 @@ struct alpha_machine_vector ruffian_mv __initmv = { init_arch: pyxis_init_arch, init_irq: ruffian_init_irq, init_rtc: ruffian_init_rtc, - init_pci: common_init_pci, + init_pci: cia_init_pci, kill_arch: ruffian_kill_arch, pci_map_irq: ruffian_map_irq, pci_swizzle: common_swizzle, |