diff options
-rw-r--r-- | arch/powerpc/kernel/prom.c | 3 | ||||
-rw-r--r-- | include/asm-powerpc/prom.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 4c524cb52184..ef3619c28702 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -1975,8 +1975,7 @@ struct property *of_find_property(struct device_node *np, const char *name, | |||
1975 | * Find a property with a given name for a given node | 1975 | * Find a property with a given name for a given node |
1976 | * and return the value. | 1976 | * and return the value. |
1977 | */ | 1977 | */ |
1978 | unsigned char *get_property(struct device_node *np, const char *name, | 1978 | void *get_property(struct device_node *np, const char *name, int *lenp) |
1979 | int *lenp) | ||
1980 | { | 1979 | { |
1981 | struct property *pp = of_find_property(np,name,lenp); | 1980 | struct property *pp = of_find_property(np,name,lenp); |
1982 | return pp ? pp->value : NULL; | 1981 | return pp ? pp->value : NULL; |
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index 010d186d095b..b0768f474809 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -167,8 +167,8 @@ extern void unflatten_device_tree(void); | |||
167 | extern void early_init_devtree(void *); | 167 | extern void early_init_devtree(void *); |
168 | extern int device_is_compatible(struct device_node *device, const char *); | 168 | extern int device_is_compatible(struct device_node *device, const char *); |
169 | extern int machine_is_compatible(const char *compat); | 169 | extern int machine_is_compatible(const char *compat); |
170 | extern unsigned char *get_property(struct device_node *node, const char *name, | 170 | extern void *get_property(struct device_node *node, const char *name, |
171 | int *lenp); | 171 | int *lenp); |
172 | extern void print_properties(struct device_node *node); | 172 | extern void print_properties(struct device_node *node); |
173 | extern int prom_n_addr_cells(struct device_node* np); | 173 | extern int prom_n_addr_cells(struct device_node* np); |
174 | extern int prom_n_size_cells(struct device_node* np); | 174 | extern int prom_n_size_cells(struct device_node* np); |