diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 14:47:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 14:47:58 -0800 |
| commit | 6e9d6b8ee4e0c37d3952256e6472c57490d6780d (patch) | |
| tree | 39161fdc999565ddb47a55fad57ab6f1b7266b97 /drivers/scsi/sata_nv.c | |
| parent | d3f8cf489993658702b7e58ff37162246263de53 (diff) | |
| parent | a9524a76f70f3343e4be27f95a7e92a8ba5f9009 (diff) | |
| download | blackbird-op-linux-6e9d6b8ee4e0c37d3952256e6472c57490d6780d.tar.gz blackbird-op-linux-6e9d6b8ee4e0c37d3952256e6472c57490d6780d.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/sata_nv.c')
| -rw-r--r-- | drivers/scsi/sata_nv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 1a56d6c79ddd..d573888eda76 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c @@ -61,6 +61,7 @@ #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/device.h> #include "scsi.h" #include <scsi/scsi_host.h> #include <linux/libata.h> @@ -383,7 +384,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) return -ENODEV; if (!printed_version++) - printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); + dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); rc = pci_enable_device(pdev); if (rc) |
