projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull mca-check-psp into release branch
[powerpc.git]
/
drivers
/
scsi
/
sata_nv.c
diff --git
a/drivers/scsi/sata_nv.c
b/drivers/scsi/sata_nv.c
index
8866530
..
37a4fae
100644
(file)
--- a/
drivers/scsi/sata_nv.c
+++ b/
drivers/scsi/sata_nv.c
@@
-61,7
+61,7
@@
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
-#include
"scsi.h"
+#include
<linux/device.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
@@
-218,7
+218,7
@@
static struct pci_driver nv_pci_driver = {
.remove = ata_pci_remove_one,
};
.remove = ata_pci_remove_one,
};
-static
Scsi_Host_T
emplate nv_sht = {
+static
struct scsi_host_t
emplate nv_sht = {
.module = THIS_MODULE,
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
.module = THIS_MODULE,
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
@@
-238,7
+238,7
@@
static Scsi_Host_Template nv_sht = {
.ordered_flush = 1,
};
.ordered_flush = 1,
};
-static struct ata_port_operations nv_ops = {
+static
const
struct ata_port_operations nv_ops = {
.port_disable = ata_port_disable,
.tf_load = ata_tf_load,
.tf_read = ata_tf_read,
.port_disable = ata_port_disable,
.tf_load = ata_tf_load,
.tf_read = ata_tf_read,
@@
-383,7
+383,7
@@
static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
return -ENODEV;
if (!printed_version++)
return -ENODEV;
if (!printed_version++)
-
printk(KERN_DEBUG DRV_NAME "
version " DRV_VERSION "\n");
+
dev_printk(KERN_DEBUG, &pdev->dev, "
version " DRV_VERSION "\n");
rc = pci_enable_device(pdev);
if (rc)
rc = pci_enable_device(pdev);
if (rc)