fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index bf2cfa1..49bedfb 100644 (file)
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -8,7 +8,6 @@
  * Code supporting the ALCOR and XLT (XL-300/366/433).
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/mm.h>
@@ -16,12 +15,12 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/reboot.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>
@@ -101,7 +100,7 @@ static struct hw_interrupt_type alcor_irq_type = {
 };
 
 static void
-alcor_device_interrupt(unsigned long vector, struct pt_regs *regs)
+alcor_device_interrupt(unsigned long vector)
 {
        unsigned long pld;
        unsigned int i;
@@ -117,9 +116,9 @@ alcor_device_interrupt(unsigned long vector, struct pt_regs *regs)
                i = ffz(~pld);
                pld &= pld - 1; /* clear least bit set */
                if (i == 31) {
-                       isa_device_interrupt(vector, regs);
+                       isa_device_interrupt(vector);
                } else {
-                       handle_irq(16 + i, regs);
+                       handle_irq(16 + i);
                }
        }
 }
@@ -144,7 +143,7 @@ alcor_init_irq(void)
                if (i >= 16+20 && i <= 16+30)
                        continue;
                irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
-               irq_desc[i].handler = &alcor_irq_type;
+               irq_desc[i].chip = &alcor_irq_type;
        }
        i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;
 
@@ -254,7 +253,7 @@ alcor_init_pci(void)
         * motherboard, by looking for a 21040 TULIP in slot 6, which is
         * built into XLT and BRET/MAVERICK, but not available on ALCOR.
         */
-       dev = pci_find_device(PCI_VENDOR_ID_DEC,
+       dev = pci_get_device(PCI_VENDOR_ID_DEC,
                              PCI_DEVICE_ID_DEC_TULIP,
                              NULL);
        if (dev && dev->devfn == PCI_DEVFN(6,0)) {
@@ -262,6 +261,7 @@ alcor_init_pci(void)
                printk(KERN_INFO "%s: Detected AS500 or XLT motherboard.\n",
                       __FUNCTION__);
        }
+       pci_dev_put(dev);
 }
 
 
@@ -274,7 +274,6 @@ struct alpha_machine_vector alcor_mv __initmv = {
        DO_EV5_MMU,
        DO_DEFAULT_RTC,
        DO_CIA_IO,
-       DO_CIA_BUS,
        .machine_check          = cia_machine_check,
        .max_isa_dma_address    = ALPHA_ALCOR_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = EISA_DEFAULT_IO_BASE,
@@ -292,7 +291,7 @@ struct alpha_machine_vector alcor_mv __initmv = {
        .pci_swizzle            = common_swizzle,
 
        .sys = { .cia = {
-           .gru_int_req_bits   = ALCOR_GRU_INT_REQ_BITS
+               .gru_int_req_bits = ALCOR_GRU_INT_REQ_BITS
        }}
 };
 ALIAS_MV(alcor)
@@ -302,7 +301,6 @@ struct alpha_machine_vector xlt_mv __initmv = {
        DO_EV5_MMU,
        DO_DEFAULT_RTC,
        DO_CIA_IO,
-       DO_CIA_BUS,
        .machine_check          = cia_machine_check,
        .max_isa_dma_address    = ALPHA_MAX_ISA_DMA_ADDRESS,
        .min_io_address         = EISA_DEFAULT_IO_BASE,
@@ -320,7 +318,7 @@ struct alpha_machine_vector xlt_mv __initmv = {
        .pci_swizzle            = common_swizzle,
 
        .sys = { .cia = {
-           .gru_int_req_bits   = XLT_GRU_INT_REQ_BITS
+               .gru_int_req_bits = XLT_GRU_INT_REQ_BITS
        }}
 };