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_pcmcia.c
diff --git
a/drivers/ata/pata_pcmcia.c
b/drivers/ata/pata_pcmcia.c
index
aa39bda
..
118c28e
100644
(file)
--- a/
drivers/ata/pata_pcmcia.c
+++ b/
drivers/ata/pata_pcmcia.c
@@
-165,7
+165,7
@@
static struct ata_port_operations pcmcia_8bit_port_ops = {
.sff_data_xfer = ata_data_xfer_8bit,
.cable_detect = ata_cable_40wire,
.set_mode = pcmcia_set_mode_8bit,
- .
drain_fifo
= pcmcia_8bit_drain_fifo,
+ .
sff_drain_fifo
= pcmcia_8bit_drain_fifo,
};