renamed to kread

[linux-2.6.git] / arch / alpha / kernel / sys_eb64p.c

diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index 035af0b..ed108b6 100644 (file)
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -8,19 +8,18 @@
  * Code supporting the EB64+ and EB66.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -137,7 +136,7 @@ eb64p_init_irq(void)
 
        for (i = 16; i < 32; ++i) {
                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-               irq_desc[i].handler = &eb64p_irq_type;
+               irq_desc[i].chip = &eb64p_irq_type;
        }               
 
        common_init_isa_dma();
@@ -212,7 +211,6 @@ struct alpha_machine_vector eb64p_mv __initmv = {
        DO_EV4_MMU,
        DO_DEFAULT_RTC,
        DO_APECS_IO,
-       DO_APECS_BUS,
        .machine_check          = apecs_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,
@@ -238,7 +236,6 @@ struct alpha_machine_vector eb66_mv __initmv = {
        DO_EV4_MMU,
        DO_DEFAULT_RTC,
        DO_LCA_IO,
-       DO_LCA_BUS,
        .machine_check          = lca_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = DEFAULT_IO_BASE,