diff options
| author | Randy Dunlap <rdunlap@infradead.org> | 2012-11-30 10:01:51 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-30 10:04:06 +0000 |
| commit | 465aac6d496aa3e99caaa6868865fb3830f73d80 (patch) | |
| tree | 105ef4075b2f2f351aafb6d87ee69d60b3c1e751 /drivers/of/pdt.c | |
| parent | f3b6159e6a12136ac9c59aaa92ba9f3e484df650 (diff) | |
| download | linux-0-day-465aac6d496aa3e99caaa6868865fb3830f73d80.tar.gz linux-0-day-465aac6d496aa3e99caaa6868865fb3830f73d80.tar.xz | |
Fix build when CONFIG_W1_MASTER_GPIO=m b exporting "allnodes"
ERROR: "allnodes" [drivers/w1/masters/w1-gpio.ko] undefined!
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
[grant.likely: allnodes is too generic; rename to of_allnodes]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Ville Syrjala <syrjala@sci.fi>
Diffstat (limited to 'drivers/of/pdt.c')
| -rw-r--r-- | drivers/of/pdt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c index 07cc1d678e4d3..37b56fd716e66 100644 --- a/drivers/of/pdt.c +++ b/drivers/of/pdt.c @@ -241,15 +241,15 @@ void __init of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops) BUG_ON(!ops); of_pdt_prom_ops = ops; - allnodes = of_pdt_create_node(root_node, NULL); + of_allnodes = of_pdt_create_node(root_node, NULL); #if defined(CONFIG_SPARC) - allnodes->path_component_name = ""; + of_allnodes->path_component_name = ""; #endif - allnodes->full_name = "/"; + of_allnodes->full_name = "/"; - nextp = &allnodes->allnext; - allnodes->child = of_pdt_build_tree(allnodes, - of_pdt_prom_ops->getchild(allnodes->phandle), &nextp); + nextp = &of_allnodes->allnext; + of_allnodes->child = of_pdt_build_tree(of_allnodes, + of_pdt_prom_ops->getchild(of_allnodes->phandle), &nextp); /* Get pointer to "/chosen" and "/aliasas" nodes for use everywhere */ of_alias_scan(kernel_tree_alloc); |