diff -u -r 60_pci_tra/arch/ia64/kernel/pci.c 70_enable_device/arch/ia64/kernel/pci.c --- 60_pci_tra/arch/ia64/kernel/pci.c Mon Jul 22 09:57:07 2002 +++ 70_enable_device/arch/ia64/kernel/pci.c Mon Jul 22 09:59:09 2002 @@ -342,8 +342,7 @@ if (!dev) return -EINVAL; - /* Not needed, since we enable all devices at startup. */ - + platform_pci_enable_device(dev); printk(KERN_INFO "PCI: Found IRQ %d for device %s\n", dev->irq, dev->slot_name); return 0; } diff -u -r 60_pci_tra/include/asm-ia64/machvec.h 70_enable_device/include/asm-ia64/machvec.h --- 60_pci_tra/include/asm-ia64/machvec.h Mon Jul 22 07:59:47 2002 +++ 70_enable_device/include/asm-ia64/machvec.h Mon Jul 22 09:59:09 2002 @@ -24,6 +24,7 @@ typedef void ia64_mv_cpu_init_t(void); typedef void ia64_mv_irq_init_t (void); typedef void ia64_mv_pci_fixup_t (int); +typedef void ia64_mv_pci_enable_device_t (struct pci_dev *); typedef unsigned long ia64_mv_map_nr_t (unsigned long); typedef void ia64_mv_mca_init_t (void); typedef void ia64_mv_mca_handler_t (void); @@ -92,7 +93,8 @@ # define platform_cmci_handler ia64_mv.cmci_handler # define platform_log_print ia64_mv.log_print # define platform_pci_fixup ia64_mv.pci_fixup -# define platform_send_ipi ia64_mv.send_ipi +# define platform_pci_enable_device ia64_mv.pci_enable_device +# define platform_send_ipi ia64_mv.send_ipi # define platform_global_tlb_purge ia64_mv.global_tlb_purge # define platform_pci_dma_init ia64_mv.dma_init # define platform_pci_alloc_consistent ia64_mv.alloc_consistent @@ -123,6 +125,7 @@ ia64_mv_cpu_init_t *cpu_init; ia64_mv_irq_init_t *irq_init; ia64_mv_pci_fixup_t *pci_fixup; + ia64_mv_pci_enable_device_t *pci_enable_device; ia64_mv_map_nr_t *map_nr; ia64_mv_mca_init_t *mca_init; ia64_mv_mca_handler_t *mca_handler; @@ -160,6 +163,7 @@ platform_cpu_init, \ platform_irq_init, \ platform_pci_fixup, \ + platform_pci_enable_device, \ platform_map_nr, \ platform_mca_init, \ platform_mca_handler, \ @@ -238,6 +242,9 @@ #endif #ifndef platform_pci_fixup # define platform_pci_fixup ((ia64_mv_pci_fixup_t *) machvec_noop) +#endif +#ifndef platform_pci_enable_device +# define platform_pci_enable_device ((ia64_mv_pci_enable_device_t *) machvec_noop) #endif #ifndef platform_send_ipi # define platform_send_ipi ia64_send_ipi /* default to architected version */