diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-12 23:15:27 +0000 |
| commit | ae38fd1e4c98588314a42097c5a5e77dcef23561 (patch) | |
| tree | f9f10c203bb9e5fbad4810d1f8774c08dfad20ff /drivers/pnp | |
| parent | 466a823d79f41d0713b272e48fd73e494b0588e0 (diff) | |
Merge with Linux 2.3.50.
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/isapnp.c | 4 | ||||
| -rw-r--r-- | drivers/pnp/quirks.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pnp/isapnp.c b/drivers/pnp/isapnp.c index 8f3a6e1d8..51468e1ef 100644 --- a/drivers/pnp/isapnp.c +++ b/drivers/pnp/isapnp.c @@ -2040,7 +2040,7 @@ static int __init isapnp_do_reserve_irq(int irq) if (isapnp_reserve_irq[i] < 0) { isapnp_reserve_irq[i] = irq; #ifdef ISAPNP_DEBUG - printk("IRQ %i is reserved now.\n", irq); + printk("isapnp: IRQ %i is reserved now.\n", irq); #endif return 0; } @@ -2056,7 +2056,7 @@ static void __init isapnp_pci_init(void) pci_for_each_dev(dev) { #ifdef ISAPNP_DEBUG - printk("PCI: reserved IRQ: %i\n", dev->irq); + printk("isapnp: PCI: reserved IRQ: %i\n", dev->irq); #endif if (dev->irq > 0) isapnp_do_reserve_irq(dev->irq); diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c index 838241de2..aeca7fc3c 100644 --- a/drivers/pnp/quirks.c +++ b/drivers/pnp/quirks.c @@ -45,7 +45,7 @@ static void __init quirk_awe32_resources(struct pci_dev *dev) port3->min += 0x800; port3->max += 0x800; } - printk(KERN_INFO "ISAPnP: AWE32 quirk - adding two ports\n"); + printk(KERN_INFO "isapnp: AWE32 quirk - adding two ports\n"); } @@ -71,7 +71,7 @@ void isapnp_fixup_device(struct pci_dev *dev) while (isapnp_fixups[i].vendor != 0) { if ((isapnp_fixups[i].vendor == dev->vendor) && (isapnp_fixups[i].device == dev->device)) { - printk(KERN_DEBUG "PnP: Calling quirk for %02x:%02x\n", + printk(KERN_DEBUG "isapnp: Calling quirk for %02x:%02x\n", dev->bus->number, dev->devfn); isapnp_fixups[i].quirk_function(dev); } |