diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:49 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:49 -0400 |
commit | 6f1924928377bd035a9f64466f91a487c69271d2 (patch) | |
tree | 1a162237e621a0d6ebcc2fca305d2c96d284e5a3 /arch/microblaze | |
parent | 731581e6a653f6a68a4d7ba9df6b886a85c7d080 (diff) |
of: merge struct device_node
Merge of common code duplicated between Sparc, PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 11cb48419c7d..64e8b3a8c3cf 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -73,26 +73,6 @@ struct boot_param_header { | |||
73 | u32 dt_struct_size; /* size of the DT structure block */ | 73 | u32 dt_struct_size; /* size of the DT structure block */ |
74 | }; | 74 | }; |
75 | 75 | ||
76 | struct device_node { | ||
77 | const char *name; | ||
78 | const char *type; | ||
79 | phandle node; | ||
80 | phandle linux_phandle; | ||
81 | char *full_name; | ||
82 | |||
83 | struct property *properties; | ||
84 | struct property *deadprops; /* removed properties */ | ||
85 | struct device_node *parent; | ||
86 | struct device_node *child; | ||
87 | struct device_node *sibling; | ||
88 | struct device_node *next; /* next device of same type */ | ||
89 | struct device_node *allnext; /* next in list of all nodes */ | ||
90 | struct proc_dir_entry *pde; /* this node's proc directory */ | ||
91 | struct kref kref; | ||
92 | unsigned long _flags; | ||
93 | void *data; | ||
94 | }; | ||
95 | |||
96 | extern struct device_node *of_chosen; | 76 | extern struct device_node *of_chosen; |
97 | 77 | ||
98 | static inline int of_node_check_flag(struct device_node *n, unsigned long flag) | 78 | static inline int of_node_check_flag(struct device_node *n, unsigned long flag) |