diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2007-07-20 07:58:38 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-22 13:30:59 +0200 |
| commit | 34f329db54e8154cf7faf0e7c45e7c16facfbbfe (patch) | |
| tree | f9f02c217b00f9f5098a272a7c11224b16d9798e | |
| parent | [POWERPC] Fix ARCH=ppc builds (diff) | |
| download | linux-34f329db54e8154cf7faf0e7c45e7c16facfbbfe.tar.xz linux-34f329db54e8154cf7faf0e7c45e7c16facfbbfe.zip | |
[POWERPC] of_detach_node()'s device node argument cannot be const
...since it modifies it (when it sets the OF_DETACHED flag).
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/prom.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index bdcd23d8d8b9..a38197b12d3e 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -1218,7 +1218,7 @@ void of_attach_node(struct device_node *np) * a reference to the node. The memory associated with the node * is not freed until its refcount goes to zero. */ -void of_detach_node(const struct device_node *np) +void of_detach_node(struct device_node *np) { struct device_node *parent; diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index 6e391c9894ce..672083787a1d 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h @@ -139,7 +139,7 @@ extern unsigned long __init of_get_flat_dt_root(void); /* For updating the device tree at runtime */ extern void of_attach_node(struct device_node *); -extern void of_detach_node(const struct device_node *); +extern void of_detach_node(struct device_node *); /* Other Prototypes */ extern void finish_device_tree(void); |