diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:24:34 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:24:34 -0500 |
commit | 95dbf5c4be080e94880ead13773d1a14eec8f4de (patch) | |
tree | 9113691b4b6c689989b4528ee0f3df3689c42066 /drivers/scsi/sata_mv.c | |
parent | 054ee8fd39f1b5d50e803f126b63f400d631eea4 (diff) | |
parent | 6e9d6b8ee4e0c37d3952256e6472c57490d6780d (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
-rw-r--r-- | drivers/scsi/sata_mv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index a3ab14c79cdd..64af334e71f4 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
30 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
32 | #include <linux/device.h> | ||
32 | #include "scsi.h" | 33 | #include "scsi.h" |
33 | #include <scsi/scsi_host.h> | 34 | #include <scsi/scsi_host.h> |
34 | #include <linux/libata.h> | 35 | #include <linux/libata.h> |
@@ -1438,9 +1439,9 @@ static void mv_print_info(struct ata_probe_ent *probe_ent) | |||
1438 | else | 1439 | else |
1439 | scc_s = "unknown"; | 1440 | scc_s = "unknown"; |
1440 | 1441 | ||
1441 | printk(KERN_INFO DRV_NAME | 1442 | dev_printk(KERN_INFO, &pdev->dev, |
1442 | "(%s) %u slots %u ports %s mode IRQ via %s\n", | 1443 | "%u slots %u ports %s mode IRQ via %s\n", |
1443 | pci_name(pdev), (unsigned)MV_MAX_Q_DEPTH, probe_ent->n_ports, | 1444 | (unsigned)MV_MAX_Q_DEPTH, probe_ent->n_ports, |
1444 | scc_s, (MV_HP_FLAG_MSI & hpriv->hp_flags) ? "MSI" : "INTx"); | 1445 | scc_s, (MV_HP_FLAG_MSI & hpriv->hp_flags) ? "MSI" : "INTx"); |
1445 | } | 1446 | } |
1446 | 1447 | ||
@@ -1461,9 +1462,8 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1461 | void __iomem *mmio_base; | 1462 | void __iomem *mmio_base; |
1462 | int pci_dev_busy = 0, rc; | 1463 | int pci_dev_busy = 0, rc; |
1463 | 1464 | ||
1464 | if (!printed_version++) { | 1465 | if (!printed_version++) |
1465 | printk(KERN_INFO DRV_NAME " version " DRV_VERSION "\n"); | 1466 | dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n"); |
1466 | } | ||
1467 | 1467 | ||
1468 | rc = pci_enable_device(pdev); | 1468 | rc = pci_enable_device(pdev); |
1469 | if (rc) { | 1469 | if (rc) { |