Merge git://git.infradead.org/hdrinstall-2.6

[linux-2.6-omap-h63xx.git] / include / asm-i386 / pci.h

diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index 3561899eb826bee418bbca0f457398736dc6b90e..64b6d0baedbce7109c8691095e55b039186750c2 100644 (file)
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -1,7 +1,6 @@
 #ifndef __i386_PCI_H
 #define __i386_PCI_H
 
-#include <linux/config.h>
 
 #ifdef __KERNEL__
 #include <linux/mm.h>          /* for struct page */
@@ -27,7 +26,7 @@ void pcibios_config_init(void);
 struct pci_bus * pcibios_scan_root(int bus);
 
 void pcibios_set_master(struct pci_dev *dev);
-void pcibios_penalize_isa_irq(int irq);
+void pcibios_penalize_isa_irq(int irq, int active);
 struct irq_routing_table *pcibios_get_irq_routing_table(void);
 int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq);