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/viro/vfs-2.6
[pandora-kernel.git]
/
drivers
/
ata
/
pata_macio.c
diff --git
a/drivers/ata/pata_macio.c
b/drivers/ata/pata_macio.c
index
b5b48e7
..
76640ac
100644
(file)
--- a/
drivers/ata/pata_macio.c
+++ b/
drivers/ata/pata_macio.c
@@
-1110,7
+1110,7
@@
static int __devinit pata_macio_common_init(struct pata_macio_priv *priv,
/* Start it up */
priv->irq = irq;
- return ata_host_activate(priv->host, irq, ata_
sff
_interrupt, 0,
+ return ata_host_activate(priv->host, irq, ata_
bmdma
_interrupt, 0,
&pata_macio_sht);
}