diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-02 20:54:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:17 -0400 |
commit | 0e56efc7dcd1eb5004363e52bdbe801783245638 (patch) | |
tree | 22b3f52d1ccc18d0e820ed69412a8054e20798d1 /include | |
parent | a7edd0e676d51145ae634a2acf7a447e319200fa (diff) |
[POWERPC] Rename get_property to of_get_property
This is more consistent and gets us closer to the Sparc code.
We add a get_property define for compatibility during the change over.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/prom.h | 3 | ||||
-rw-r--r-- | include/asm-ppc/prom.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index 994de8ea3308..448c5ce76fbe 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -165,9 +165,10 @@ extern void early_init_devtree(void *); | |||
165 | extern int device_is_compatible(const struct device_node *device, | 165 | extern int device_is_compatible(const struct device_node *device, |
166 | const char *); | 166 | const char *); |
167 | extern int machine_is_compatible(const char *compat); | 167 | extern int machine_is_compatible(const char *compat); |
168 | extern const void *get_property(const struct device_node *node, | 168 | extern const void *of_get_property(const struct device_node *node, |
169 | const char *name, | 169 | const char *name, |
170 | int *lenp); | 170 | int *lenp); |
171 | #define get_property(a, b, c) of_get_property((a), (b), (c)) | ||
171 | extern void print_properties(struct device_node *node); | 172 | extern void print_properties(struct device_node *node); |
172 | extern int prom_n_addr_cells(struct device_node* np); | 173 | extern int prom_n_addr_cells(struct device_node* np); |
173 | extern int prom_n_size_cells(struct device_node* np); | 174 | extern int prom_n_size_cells(struct device_node* np); |
diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h index adc5ae784924..901f7fa8b2d7 100644 --- a/include/asm-ppc/prom.h +++ b/include/asm-ppc/prom.h | |||
@@ -34,7 +34,8 @@ extern unsigned long sub_reloc_offset(unsigned long); | |||
34 | */ | 34 | */ |
35 | #define machine_is_compatible(x) 0 | 35 | #define machine_is_compatible(x) 0 |
36 | #define of_find_compatible_node(f, t, c) NULL | 36 | #define of_find_compatible_node(f, t, c) NULL |
37 | #define get_property(p, n, l) NULL | 37 | #define of_get_property(p, n, l) NULL |
38 | #define get_property(a, b, c) of_get_property((a), (b), (c)) | ||
38 | 39 | ||
39 | #endif /* _PPC_PROM_H */ | 40 | #endif /* _PPC_PROM_H */ |
40 | #endif /* __KERNEL__ */ | 41 | #endif /* __KERNEL__ */ |