diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:25:28 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:25:28 -0500 |
| commit | 122401ce39faab22b29eb11b20e4342f7f566b1b (patch) | |
| tree | e164f8fa5decc4b7182e7d66b1634c7fd43b9f7f /drivers/scsi/sata_vsc.c | |
| parent | 94ec1ef1cf29e137e5c79372e432b040c6604be6 (diff) | |
| parent | 6e9d6b8ee4e0c37d3952256e6472c57490d6780d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_vsc.c')
| -rw-r--r-- | drivers/scsi/sata_vsc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index 3766afe4b288..4349bc9193e3 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/delay.h> | 42 | #include <linux/delay.h> |
| 43 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
| 44 | #include <linux/dma-mapping.h> | 44 | #include <linux/dma-mapping.h> |
| 45 | #include <linux/device.h> | ||
| 45 | #include "scsi.h" | 46 | #include "scsi.h" |
| 46 | #include <scsi/scsi_host.h> | 47 | #include <scsi/scsi_host.h> |
| 47 | #include <linux/libata.h> | 48 | #include <linux/libata.h> |
| @@ -295,7 +296,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d | |||
| 295 | int rc; | 296 | int rc; |
| 296 | 297 | ||
| 297 | if (!printed_version++) | 298 | if (!printed_version++) |
| 298 | printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); | 299 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); |
| 299 | 300 | ||
| 300 | rc = pci_enable_device(pdev); | 301 | rc = pci_enable_device(pdev); |
| 301 | if (rc) | 302 | if (rc) |