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 git://git.infradead.org/~dwmw2/mtd-2.6.35
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
parport.h
diff --git
a/arch/sparc/include/asm/parport.h
b/arch/sparc/include/asm/parport.h
index
ff9ead6
..
c333b8d
100644
(file)
--- a/
arch/sparc/include/asm/parport.h
+++ b/
arch/sparc/include/asm/parport.h
@@
-113,7
+113,7
@@
static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
struct parport *p;
int slot, err;
struct parport *p;
int slot, err;
- parent = op->node->parent;
+ parent = op->
dev.of_
node->parent;
if (!strcmp(parent->name, "dma")) {
p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0], PARPORT_DMA_NOFIFO,
if (!strcmp(parent->name, "dma")) {
p = parport_pc_probe_port(base, base + 0x400,
op->irqs[0], PARPORT_DMA_NOFIFO,
@@
-232,8
+232,11
@@
static const struct of_device_id ecpp_match[] = {
};
static struct of_platform_driver ecpp_driver = {
};
static struct of_platform_driver ecpp_driver = {
- .name = "ecpp",
- .match_table = ecpp_match,
+ .driver = {
+ .name = "ecpp",
+ .owner = THIS_MODULE,
+ .of_match_table = ecpp_match,
+ },
.probe = ecpp_probe,
.remove = __devexit_p(ecpp_remove),
};
.probe = ecpp_probe,
.remove = __devexit_p(ecpp_remove),
};