of: unify phandle name in struct device_node

[safe/jmp/linux-2.6] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index d4c014a..dbabf86 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -39,10 +39,7 @@ struct of_irq_controller;
 struct device_node {
        const char *name;
        const char *type;
-       phandle node;
-#if !defined(CONFIG_SPARC)
-       phandle linux_phandle;
-#endif
+       phandle phandle;
        char    *full_name;
 
        struct  property *properties;