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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_mpc52xx.c
diff --git
a/drivers/ata/pata_mpc52xx.c
b/drivers/ata/pata_mpc52xx.c
index
36afe2c
..
f087ab5
100644
(file)
--- a/
drivers/ata/pata_mpc52xx.c
+++ b/
drivers/ata/pata_mpc52xx.c
@@
-659,7
+659,7
@@
mpc52xx_ata_init_one(struct device *dev, struct mpc52xx_ata_priv *priv,
ata_port_desc(ap, "ata_regs 0x%lx", raw_ata_regs);
/* activate host */
- return ata_host_activate(host, priv->ata_irq, ata_
sff
_interrupt, 0,
+ return ata_host_activate(host, priv->ata_irq, ata_
bmdma
_interrupt, 0,
&mpc52xx_ata_sht);
}