projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pata_scc had been missed by ata_std_prereset() switch
[powerpc.git]
/
drivers
/
ata
/
pata_scc.c
diff --git
a/drivers/ata/pata_scc.c
b/drivers/ata/pata_scc.c
index
203f463
..
844e53b
100644
(file)
--- a/
drivers/ata/pata_scc.c
+++ b/
drivers/ata/pata_scc.c
@@
-864,10
+864,10
@@
static void scc_bmdma_freeze (struct ata_port *ap)
* @ap: ATA port to be reset
*/
* @ap: ATA port to be reset
*/
-static int scc_pata_prereset (struct ata_port *ap)
+static int scc_pata_prereset (struct ata_port *ap
, unsigned long deadline
)
{
ap->cbl = ATA_CBL_PATA80;
{
ap->cbl = ATA_CBL_PATA80;
- return ata_std_prereset(ap);
+ return ata_std_prereset(ap
, deadline
);
}
/**
}
/**
@@
-984,10
+984,6
@@
static struct scsi_host_template scc_sht = {
.slave_configure = ata_scsi_slave_config,
.slave_destroy = ata_scsi_slave_destroy,
.bios_param = ata_std_bios_param,
.slave_configure = ata_scsi_slave_config,
.slave_destroy = ata_scsi_slave_destroy,
.bios_param = ata_std_bios_param,
-#ifdef CONFIG_PM
- .resume = ata_scsi_device_resume,
- .suspend = ata_scsi_device_suspend,
-#endif
};
static const struct ata_port_operations scc_pata_ops = {
};
static const struct ata_port_operations scc_pata_ops = {