projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap-fixes' into fixes
[powerpc.git]
/
drivers
/
ata
/
pata_atiixp.c
diff --git
a/drivers/ata/pata_atiixp.c
b/drivers/ata/pata_atiixp.c
index
39c871a
..
2151538
100644
(file)
--- a/
drivers/ata/pata_atiixp.c
+++ b/
drivers/ata/pata_atiixp.c
@@
-33,7
+33,7
@@
enum {
ATIIXP_IDE_UDMA_MODE = 0x56
};
ATIIXP_IDE_UDMA_MODE = 0x56
};
-static int atiixp_pre_reset(struct ata_port *ap)
+static int atiixp_pre_reset(struct ata_port *ap
, unsigned long deadline
)
{
static const struct pci_bits atiixp_enable_bits[] = {
{ 0x48, 1, 0x01, 0x00 },
{
static const struct pci_bits atiixp_enable_bits[] = {
{ 0x48, 1, 0x01, 0x00 },
@@
-44,7
+44,7
@@
static int atiixp_pre_reset(struct ata_port *ap)
if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no]))
return -ENOENT;
if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no]))
return -ENOENT;
- return ata_std_prereset(ap);
+ return ata_std_prereset(ap
, deadline
);
}
static void atiixp_error_handler(struct ata_port *ap)
}
static void atiixp_error_handler(struct ata_port *ap)