git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
scsi
/
sata_svw.c
diff --git
a/drivers/scsi/sata_svw.c
b/drivers/scsi/sata_svw.c
index
eca3eeb
..
b985355
100644
(file)
--- a/
drivers/scsi/sata_svw.c
+++ b/
drivers/scsi/sata_svw.c
@@
-49,7
+49,7
@@
#endif /* CONFIG_PPC_OF */
#define DRV_NAME "sata_svw"
#endif /* CONFIG_PPC_OF */
#define DRV_NAME "sata_svw"
-#define DRV_VERSION "1.0
5
"
+#define DRV_VERSION "1.0
4
"
/* Taskfile registers offsets */
#define K2_SATA_TF_CMD_OFFSET 0x00
/* Taskfile registers offsets */
#define K2_SATA_TF_CMD_OFFSET 0x00
@@
-245,7
+245,7
@@
static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
return 0;
/* Find the OF node for the PCI device proper */
return 0;
/* Find the OF node for the PCI device proper */
- np = pci_device_to_OF_node(
to_pci_dev(ap->host_set->dev)
);
+ np = pci_device_to_OF_node(
ap->host_set->pdev
);
if (np == NULL)
return 0;
if (np == NULL)
return 0;
@@
-376,7
+376,7
@@
static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
}
memset(probe_ent, 0, sizeof(*probe_ent));
}
memset(probe_ent, 0, sizeof(*probe_ent));
- probe_ent->
dev = pci_dev_to_dev(pdev)
;
+ probe_ent->
pdev = pdev
;
INIT_LIST_HEAD(&probe_ent->node);
mmio_base = ioremap(pci_resource_start(pdev, 5),
INIT_LIST_HEAD(&probe_ent->node);
mmio_base = ioremap(pci_resource_start(pdev, 5),