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_sx4.c | |
parent | 054ee8fd39f1b5d50e803f126b63f400d631eea4 (diff) | |
parent | 6e9d6b8ee4e0c37d3952256e6472c57490d6780d (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
-rw-r--r-- | drivers/scsi/sata_sx4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index 8e2e7b8308c0..f859bbd681ed 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/scsi/sata_sx4.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
40 | #include <linux/sched.h> | 40 | #include <linux/sched.h> |
41 | #include <linux/device.h> | ||
41 | #include "scsi.h" | 42 | #include "scsi.h" |
42 | #include <scsi/scsi_host.h> | 43 | #include <scsi/scsi_host.h> |
43 | #include <linux/libata.h> | 44 | #include <linux/libata.h> |
@@ -1384,7 +1385,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id * | |||
1384 | int rc; | 1385 | int rc; |
1385 | 1386 | ||
1386 | if (!printed_version++) | 1387 | if (!printed_version++) |
1387 | printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); | 1388 | dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); |
1388 | 1389 | ||
1389 | /* | 1390 | /* |
1390 | * If this driver happens to only be useful on Apple's K2, then | 1391 | * If this driver happens to only be useful on Apple's K2, then |