patch-2.3.99-pre2 linux/arch/alpha/kernel/sys_sx164.c

• Lines: 42
• Date: Thu Mar 16 14:08:32 2000
• Orig file: v2.3.99-pre1/linux/arch/alpha/kernel/sys_sx164.c
• Orig date: Thu Mar 2 14:36:22 2000

diff -u --recursive --new-file v2.3.99-pre1/linux/arch/alpha/kernel/sys_sx164.c linux/arch/alpha/kernel/sys_sx164.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 SX164 (PCA56+PYXIS).
  */
@@ -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"
@@ -107,10 +107,10 @@
 	return COMMON_TABLE_LOOKUP;
 }
 
-void __init
+static void __init
 sx164_init_pci(void)
 {
-	common_init_pci();
+	cia_init_pci();
 	SMC669_Init(0);
 }
 
@@ -124,8 +124,8 @@
 	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_MAX_DMA_ADDRESS,
 	min_io_address:		DEFAULT_IO_BASE,
 	min_mem_address:	DEFAULT_MEM_BASE,