diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /drivers/ata/pata_icside.c | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/pata_icside.c')
| -rw-r--r-- | drivers/ata/pata_icside.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c index b56e8f722d2..9f2889fe43b 100644 --- a/drivers/ata/pata_icside.c +++ b/drivers/ata/pata_icside.c | |||
| @@ -470,7 +470,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info) | |||
| 470 | pata_icside_setup_ioaddr(ap, info->base, info, info->port[i]); | 470 | pata_icside_setup_ioaddr(ap, info->base, info, info->port[i]); |
| 471 | } | 471 | } |
| 472 | 472 | ||
| 473 | return ata_host_activate(host, ec->irq, ata_sff_interrupt, 0, | 473 | return ata_host_activate(host, ec->irq, ata_bmdma_interrupt, 0, |
| 474 | &pata_icside_sht); | 474 | &pata_icside_sht); |
| 475 | } | 475 | } |
| 476 | 476 | ||