Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / zalon.c

diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 3c4a300494a40843b49c6e86c730408a8716c832..a8d61a62522e28d180de5326b666f71fb81eec95 100644 (file)
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -137,8 +137,8 @@ zalon_probe(struct parisc_device *dev)
                goto fail;
 
        if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {
-               printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
-                       dev->dev.bus_id, dev->irq);
+         dev_printk(KERN_ERR, dev, "irq problem with %d, detaching\n ",
+                    dev->irq);
                goto fail;
        }