git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[SPARC64]: Fix conflicts in SBUS/PCI/EBUS/ISA DMA handling.
[safe/jmp/linux-2.6]
/
include
/
asm-sparc64
/
parport.h
diff --git
a/include/asm-sparc64/parport.h
b/include/asm-sparc64/parport.h
index
600afe5
..
8116e8f
100644
(file)
--- a/
include/asm-sparc64/parport.h
+++ b/
include/asm-sparc64/parport.h
@@
-117,7
+117,7
@@
static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
if (!strcmp(parent->name, "dma")) {
p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0], PARPORT_DMA_NOFIFO,
- op->dev.parent);
+ op->dev.parent
->parent
);
if (!p)
return -ENOMEM;
dev_set_drvdata(&op->dev, p);