summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell2007-04-03 02:54:01 +0200
committerPaul Mackerras2007-04-12 19:55:17 +0200
commit0e56efc7dcd1eb5004363e52bdbe801783245638 (patch)
tree22b3f52d1ccc18d0e820ed69412a8054e20798d1 /include
parent[POWERPC] get_property returns const (diff)
downloadkernel-qcow2-linux-0e56efc7dcd1eb5004363e52bdbe801783245638.tar.gz
kernel-qcow2-linux-0e56efc7dcd1eb5004363e52bdbe801783245638.tar.xz
kernel-qcow2-linux-0e56efc7dcd1eb5004363e52bdbe801783245638.zip
[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.h3
-rw-r--r--include/asm-ppc/prom.h3
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 *);
extern int device_is_compatible(const struct device_node *device,
const char *);
extern int machine_is_compatible(const char *compat);
-extern const void *get_property(const struct device_node *node,
+extern const void *of_get_property(const struct device_node *node,
const char *name,
int *lenp);
+#define get_property(a, b, c) of_get_property((a), (b), (c))
extern void print_properties(struct device_node *node);
extern int prom_n_addr_cells(struct device_node* np);
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);
*/
#define machine_is_compatible(x) 0
#define of_find_compatible_node(f, t, c) NULL
-#define get_property(p, n, l) NULL
+#define of_get_property(p, n, l) NULL
+#define get_property(a, b, c) of_get_property((a), (b), (c))
#endif /* _PPC_PROM_H */
#endif /* __KERNEL__ */