Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[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 145dcde..d6926b7 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>
@@ -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);
 }