bk://kernel.bkbits.net/gregkh/linux/pci-2.6 greg@kroah.com|ChangeSet|20041023085133|62399 greg # This is a BitKeeper generated diff -Nru style patch. # # drivers/pci/hotplug/rpaphp_pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/rpaphp_pci.c # 2004/10/15 22:33:42-07:00 akpm@bix.(none) +0 -2 # Auto merged # # drivers/pci/hotplug/rpaphp_pci.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/25 19:11:20-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810_main.c # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810.h # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/quirks.c # 2004/10/25 19:11:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/22 23:09:11-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/uhci-hcd.c # 2004/10/22 23:09:08-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/goku_udc.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.h # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/22 23:09:07-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/21 14:16:09-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/char/epca.c # 2004/10/21 14:16:05-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/21 00:09:18-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/uhci-hcd.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.h # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/ipmi/ipmi_si_intf.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ppc/kernel/pci.c # 2004/10/21 00:09:14-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/pci/i386.c # 2004/10/21 00:09:13-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/20 15:35:44-07:00 greg@kroah.com # PCI: use pci_dev_present() in irq.c check # # Signed-off-by: Greg Kroah-Hartman # # arch/i386/pci/irq.c # 2004/10/20 15:35:35-07:00 greg@kroah.com +6 -10 # PCI: use pci_dev_present() in irq.c check # # Signed-off-by: Greg Kroah-Hartman # # ChangeSet # 2004/10/19 22:04:33-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/net/typhoon.c # 2004/10/19 22:04:29-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/19 17:09:45-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810_main.c # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810.h # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/uhci-hcd.c # 2004/10/19 17:09:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ohci-pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/goku_udc.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd.h # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd-pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.h # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/eata.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pnp/system.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/quirks.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/probe.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/hotplug/shpchp_ctrl.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/parport/parport_pc.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.h # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/ipmi/ipmi_si_intf.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/epca.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/intel-agp.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/block/cpqarray.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/acpi/motherboard.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/sparc/kernel/pcic.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ppc/kernel/pci.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/i386/pci/i386.c # 2004/10/19 17:09:41-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/19 17:08:35-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/video/riva/fbdev.c # 2004/10/19 17:08:32-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810_main.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/video/i810/i810.h # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/uhci-hcd.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ohci-pci.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/host/ehci-hcd.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/goku_udc.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd.h # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/core/hcd-pci.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/quirks.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/parport/parport_pc.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/net/typhoon.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/ipmi/ipmi_si_intf.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/epca.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/intel-agp.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/block/cpqarray.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/sparc/kernel/pcic.c # 2004/10/19 17:08:31-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/18 20:26:01-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/18 20:25:57-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.h # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/nsp32.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/eata.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.h # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/message/fusion/mptbase.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/char/agp/intel-agp.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # arch/ppc/kernel/pci.c # 2004/10/18 20:25:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/15 22:33:45-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # ChangeSet # 2004/10/15 22:32:42-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/usb/host/ehci-hcd.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/usb/gadget/net2280.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/probe.c # 2004/10/15 22:32:39-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/13 13:21:15-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/scsi/megaraid/megaraid_mbox.c # 2004/10/13 13:21:11-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/10 22:18:48-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-pci # # drivers/pnp/system.c # 2004/10/10 22:18:43-07:00 akpm@bix.(none) +0 -5 # Auto merged # # drivers/acpi/motherboard.c # 2004/10/10 22:18:43-07:00 akpm@bix.(none) +0 -5 # Auto merged # # arch/i386/pci/i386.c # 2004/10/10 22:18:43-07:00 akpm@bix.(none) +0 -8 # Auto merged # # ChangeSet # 2004/10/06 20:04:33-07:00 akpm@bix.(none) # Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6 # into bix.(none):/usr/src/bk-pci # # drivers/pci/hotplug/shpchp_ctrl.c # 2004/10/06 20:04:29-07:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c --- a/arch/i386/pci/irq.c 2004-10-26 18:41:18 -07:00 +++ b/arch/i386/pci/irq.c 2004-10-26 18:41:18 -07:00 @@ -452,21 +452,17 @@ #endif - static __init int intel_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) { - struct pci_dev *dev1, *dev2; + static struct pci_device_id pirq_440gx[] = { + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_2) }, + { }, + }; /* 440GX has a proprietary PIRQ router -- don't use it */ - dev1 = pci_get_device(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82443GX_0, NULL); - dev2 = pci_get_device(PCI_VENDOR_ID_INTEL, - PCI_DEVICE_ID_INTEL_82443GX_2, NULL); - if ((dev1 != NULL) || (dev2 != NULL)) { - pci_dev_put(dev1); - pci_dev_put(dev2); + if (pci_dev_present(pirq_440gx)) return 0; - } switch(device) {