diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:47:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:47:58 -0500 |
| commit | 6e9d6b8ee4e0c37d3952256e6472c57490d6780d (patch) | |
| tree | 39161fdc999565ddb47a55fad57ab6f1b7266b97 /drivers/scsi/sata_nv.c | |
| parent | d3f8cf489993658702b7e58ff37162246263de53 (diff) | |
| parent | a9524a76f70f3343e4be27f95a7e92a8ba5f9009 (diff) | |
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 @@ | |||
| 61 | #include <linux/blkdev.h> | 61 | #include <linux/blkdev.h> |
| 62 | #include <linux/delay.h> | 62 | #include <linux/delay.h> |
| 63 | #include <linux/interrupt.h> | 63 | #include <linux/interrupt.h> |
| 64 | #include <linux/device.h> | ||
| 64 | #include "scsi.h" | 65 | #include "scsi.h" |
| 65 | #include <scsi/scsi_host.h> | 66 | #include <scsi/scsi_host.h> |
| 66 | #include <linux/libata.h> | 67 | #include <linux/libata.h> |
| @@ -383,7 +384,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 383 | return -ENODEV; | 384 | return -ENODEV; |
| 384 | 385 | ||
| 385 | if (!printed_version++) | 386 | if (!printed_version++) |
| 386 | printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); | 387 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); |
| 387 | 388 | ||
| 388 | rc = pci_enable_device(pdev); | 389 | rc = pci_enable_device(pdev); |
| 389 | if (rc) | 390 | if (rc) |