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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
of_device_common.c
diff --git
a/arch/sparc/kernel/of_device_common.c
b/arch/sparc/kernel/of_device_common.c
index
0247e68
..
10c6c36
100644
(file)
--- a/
arch/sparc/kernel/of_device_common.c
+++ b/
arch/sparc/kernel/of_device_common.c
@@
-16,7
+16,7
@@
static int node_match(struct device *dev, void *data)
struct of_device *op = to_of_device(dev);
struct device_node *dp = data;
struct of_device *op = to_of_device(dev);
struct device_node *dp = data;
- return (op->node == dp);
+ return (op->
dev.of_
node == dp);
}
struct of_device *of_find_device_by_node(struct device_node *dp)
}
struct of_device *of_find_device_by_node(struct device_node *dp)
@@
-48,7
+48,7
@@
EXPORT_SYMBOL(irq_of_parse_and_map);
void of_propagate_archdata(struct of_device *bus)
{
struct dev_archdata *bus_sd = &bus->dev.archdata;
void of_propagate_archdata(struct of_device *bus)
{
struct dev_archdata *bus_sd = &bus->dev.archdata;
- struct device_node *bus_dp = bus->node;
+ struct device_node *bus_dp = bus->
dev.of_
node;
struct device_node *dp;
for (dp = bus_dp->child; dp; dp = dp->sibling) {
struct device_node *dp;
for (dp = bus_dp->child; dp; dp = dp->sibling) {