aboutsummaryrefslogtreecommitdiff
path: root/include/asm-sparc64/parport.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-06-12 23:53:03 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-06-13 00:01:24 -0700
commitf467b998eeae933029a83db8ad860da3879acd63 (patch)
treeaf63ddd67c6e1d17f0ff52a23ff99e244cf505e2 /include/asm-sparc64/parport.h
parent56f5c0bd50e948408ac0fd587b5c89fa7e2a1b6e (diff)
[SPARC64]: Really fix parport.
We were passing a "struct pci_dev *" instead of a "struct device *" to the parport registry routines. No wonder things exploded. The ebus_bus_type hacks can be backed out from asm-sparc64/dma-mapping.h, those were wrong. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/parport.h')
-rw-r--r--include/asm-sparc64/parport.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index 6340a5253a3..23cc63f049a 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -145,7 +145,7 @@ static int parport_isa_probe(int count)
*/
if (parport_pc_probe_port(base, base + 0x400,
child->irq, PARPORT_DMA_NOFIFO,
- child->bus->self))
+ &child->bus->self->dev))
count++;
}
}
@@ -199,7 +199,8 @@ static int parport_pc_find_nonpci_ports (int autoirq, int autodma)
if (parport_pc_probe_port(base, base + 0x400,
edev->irqs[0],
- count, ebus->self))
+ count,
+ &ebus->self->dev))
count++;
}
}