please apply to 2.6
thanks!
Signed-off-by: Chas Williams <chas@xxxxxxxxxxxxxxxx>
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/10/31 10:49:16-05:00 chas@xxxxxxxxxxxxxxxxxxxxxx
# [ATM]: [ambassador] fix <irq> type and printk warning (from Randy Dunlap
<rddunlap@xxxxxxxx>)
#
# drivers/atm/ambassador.c
# 2004/10/31 10:49:01-05:00 chas@xxxxxxxxxxxxxxxxxxxxxx +2 -2
# [ATM]: [ambassador] fix <irq> type and printk warning (from Randy Dunlap
<rddunlap@xxxxxxxx>)
#
diff -Nru a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
--- a/drivers/atm/ambassador.c 2004-10-31 10:50:03 -05:00
+++ b/drivers/atm/ambassador.c 2004-10-31 10:50:03 -05:00
@@ -2261,7 +2261,7 @@
int err;
// read resources from PCI configuration space
- u8 irq = pci_dev->irq;
+ unsigned int irq = pci_dev->irq;
if (pci_dev->device == PCI_DEVICE_ID_MADGE_AMBASSADOR_BAD) {
PRINTK (KERN_ERR, "skipped broken (PLX rev 2) card");
@@ -2270,7 +2270,7 @@
}
PRINTD (DBG_INFO, "found Madge ATM adapter (amb) at"
- " IO %x, IRQ %u, MEM %p", pci_resource_start(pci_dev, 1),
+ " IO %lx, IRQ %u, MEM %p", pci_resource_start(pci_dev, 1),
irq, bus_to_virt(pci_resource_start(pci_dev, 0)));
// check IO region
|