git.samba.org
/
sfrench
/
cifs-2.6.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/jmorris...
[sfrench/cifs-2.6.git]
/
drivers
/
ide
/
cs5536.c
diff --git
a/drivers/ide/cs5536.c
b/drivers/ide/cs5536.c
index 353a35bbba636dcd1d3a22e1dd275efc7894319e..0332a95eefd4e479e2ce111d8aa20cc071495705 100644
(file)
--- a/
drivers/ide/cs5536.c
+++ b/
drivers/ide/cs5536.c
@@
-236,6
+236,7
@@
static const struct ide_dma_ops cs5536_dma_ops = {
.dma_test_irq = ide_dma_test_irq,
.dma_lost_irq = ide_dma_lost_irq,
.dma_timer_expiry = ide_dma_sff_timer_expiry,
+ .dma_sff_read_status = ide_dma_sff_read_status,
};
static const struct ide_port_info cs5536_info = {