/home/lenb/src/to-linus branch 'acpi-2.6.12'
Len Brown [Sat, 30 Jul 2005 03:31:17 +0000 (23:31 -0400)]
1  2 
arch/i386/pci/common.c
arch/i386/pci/irq.c
arch/i386/pci/pci.h
drivers/acpi/pci_irq.c
drivers/acpi/processor_idle.c
drivers/net/sk98lin/skge.c
drivers/pcmcia/yenta_socket.c
include/acpi/acpi_drivers.h
include/linux/acpi.h
sound/pci/intel8x0.c

Simple merge
@@@ -56,37 -56,9 +56,38 @@@ struct irq_router_handler 
  };
  
  int (*pcibios_enable_irq)(struct pci_dev *dev) = NULL;
+ void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
  
  /*
 + *  Check passed address for the PCI IRQ Routing Table signature
 + *  and perform checksum verification.
 + */
 +
 +static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr)
 +{
 +      struct irq_routing_table *rt;
 +      int i;
 +      u8 sum;
 +
 +      rt = (struct irq_routing_table *) addr;
 +      if (rt->signature != PIRQ_SIGNATURE ||
 +          rt->version != PIRQ_VERSION ||
 +          rt->size % 16 ||
 +          rt->size < sizeof(struct irq_routing_table))
 +              return NULL;
 +      sum = 0;
 +      for (i=0; i < rt->size; i++)
 +              sum += addr[i];
 +      if (!sum) {
 +              DBG("PCI: Interrupt Routing Table found at 0x%p\n", rt);
 +              return rt;
 +      }
 +      return NULL;
 +}
 +
 +
 +
 +/*
   *  Search 0xf0000 -- 0xfffff for the PCI IRQ Routing Table.
   */
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge