git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
drivers
/
ata
/
pata_icside.c
diff --git
a/drivers/ata/pata_icside.c
b/drivers/ata/pata_icside.c
index
b56e8f7
..
9f2889f
100644
(file)
--- 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)
pata_icside_setup_ioaddr(ap, info->base, info, info->port[i]);
}
- return ata_host_activate(host, ec->irq, ata_
sff
_interrupt, 0,
+ return ata_host_activate(host, ec->irq, ata_
bmdma
_interrupt, 0,
&pata_icside_sht);
}