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
/
ata_piix.c
diff --git
a/drivers/ata/ata_piix.c
b/drivers/ata/ata_piix.c
index
4a795fd
..
13b6b1d
100644
(file)
--- a/
drivers/ata/ata_piix.c
+++ b/
drivers/ata/ata_piix.c
@@
-275,10
+275,6
@@
static struct scsi_host_template piix_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 piix_pata_ops = {
};
static const struct ata_port_operations piix_pata_ops = {
@@
-1034,7
+1030,7
@@
static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
static int printed_version;
struct device *dev = &pdev->dev;
struct ata_port_info port_info[2];
static int printed_version;
struct device *dev = &pdev->dev;
struct ata_port_info port_info[2];
-
struct ata_port_info *ppinfo[2
] = { &port_info[0], &port_info[1] };
+
const struct ata_port_info *ppi[
] = { &port_info[0], &port_info[1] };
struct piix_host_priv *hpriv;
unsigned long port_flags;
struct piix_host_priv *hpriv;
unsigned long port_flags;
@@
-1093,7
+1089,7
@@
static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
port_info[1].mwdma_mask = 0;
port_info[1].udma_mask = 0;
}
port_info[1].mwdma_mask = 0;
port_info[1].udma_mask = 0;
}
- return ata_pci_init_one(pdev, ppi
nfo, 2
);
+ return ata_pci_init_one(pdev, ppi);
}
static int __init piix_init(void)
}
static int __init piix_init(void)