Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6

This commit is contained in:
Linus Torvalds
2005-07-12 16:04:50 -07:00
198 changed files with 7796 additions and 5469 deletions

View File

@@ -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 */
}