summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_jensen.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/alpha/kernel/sys_jensen.c')
-rw-r--r--arch/alpha/kernel/sys_jensen.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/alpha/kernel/sys_jensen.c b/arch/alpha/kernel/sys_jensen.c
index 93a65e76e..0380574a8 100644
--- a/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
@@ -2,7 +2,7 @@
* linux/arch/alpha/kernel/sys_jensen.c
*
* Copyright (C) 1995 Linus Torvalds
- * Copyright (C) 1998 Richard Henderson
+ * Copyright (C) 1998, 1999 Richard Henderson
*
* Code supporting the Jensen.
*/
@@ -28,8 +28,8 @@
#include <asm/pgtable.h>
#include "proto.h"
-#include "irq.h"
-#include "machvec.h"
+#include "irq_impl.h"
+#include "machvec_impl.h"
static void
@@ -124,7 +124,7 @@ jensen_machine_check (u64 vector, u64 la, struct pt_regs *regs)
struct alpha_machine_vector jensen_mv __initmv = {
vector_name: "Jensen",
DO_EV4_MMU,
- IO_LITE(JENSEN,jensen,jensen),
+ IO_LITE(JENSEN,jensen),
BUS(jensen),
machine_check: jensen_machine_check,
max_dma_address: ALPHA_MAX_DMA_ADDRESS,
@@ -133,12 +133,13 @@ struct alpha_machine_vector jensen_mv __initmv = {
nr_irqs: 16,
irq_probe_mask: _PROBE_MASK(16),
update_irq_hw: jensen_update_irq_hw,
- ack_irq: generic_ack_irq,
+ ack_irq: common_ack_irq,
device_interrupt: jensen_device_interrupt,
init_arch: NULL,
init_irq: jensen_init_irq,
- init_pit: generic_init_pit,
- kill_arch: generic_kill_arch,
+ init_pit: common_init_pit,
+ init_pci: NULL,
+ kill_arch: common_kill_arch,
};
ALIAS_MV(jensen)