Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
This commit is contained in:
@@ -58,7 +58,7 @@ struct pci_controller {
|
||||
|
||||
extern void pcibios_set_master(struct pci_dev *dev);
|
||||
|
||||
extern inline void pcibios_penalize_isa_irq(int irq)
|
||||
extern inline void pcibios_penalize_isa_irq(int irq, int active)
|
||||
{
|
||||
/* We don't do dynamic PCI IRQ allocation */
|
||||
}
|
||||
|
Reference in New Issue
Block a user