diff options
| -rw-r--r-- | drivers/scsi/ata_piix.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c index be021478f416..b7fbf11f3fae 100644 --- a/drivers/scsi/ata_piix.c +++ b/drivers/scsi/ata_piix.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/init.h> | 45 | #include <linux/init.h> |
| 46 | #include <linux/blkdev.h> | 46 | #include <linux/blkdev.h> |
| 47 | #include <linux/delay.h> | 47 | #include <linux/delay.h> |
| 48 | #include <linux/device.h> | ||
| 48 | #include "scsi.h" | 49 | #include "scsi.h" |
| 49 | #include <scsi/scsi_host.h> | 50 | #include <scsi/scsi_host.h> |
| 50 | #include <linux/libata.h> | 51 | #include <linux/libata.h> |
| @@ -625,7 +626,8 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 625 | unsigned int pata_chan = 0, sata_chan = 0; | 626 | unsigned int pata_chan = 0, sata_chan = 0; |
| 626 | 627 | ||
| 627 | if (!printed_version++) | 628 | if (!printed_version++) |
| 628 | printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); | 629 | dev_printk(KERN_DEBUG, &pdev->dev, |
| 630 | "version " DRV_VERSION "\n"); | ||
| 629 | 631 | ||
| 630 | /* no hotplugging support (FIXME) */ | 632 | /* no hotplugging support (FIXME) */ |
| 631 | if (!in_module_init) | 633 | if (!in_module_init) |
| @@ -672,7 +674,9 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 672 | port_info[pata_chan] = &piix_port_info[ich5_pata]; | 674 | port_info[pata_chan] = &piix_port_info[ich5_pata]; |
| 673 | n_ports++; | 675 | n_ports++; |
| 674 | 676 | ||
| 675 | printk(KERN_WARNING DRV_NAME ": combined mode detected\n"); | 677 | dev_printk(KERN_WARNING, &pdev->dev, |
| 678 | "combined mode detected (p=%u, s=%u)\n", | ||
| 679 | pata_chan, sata_chan); | ||
| 676 | } | 680 | } |
| 677 | 681 | ||
| 678 | return ata_pci_init_one(pdev, port_info, n_ports); | 682 | return ata_pci_init_one(pdev, port_info, n_ports); |
