diff options
-rw-r--r-- | arch/sparc/include/asm/prom.h | 3 | ||||
-rw-r--r-- | include/linux/of.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index e5f4a1d8fc46..ddbd870b5720 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h | |||
@@ -34,9 +34,6 @@ struct of_irq_controller { | |||
34 | void *data; | 34 | void *data; |
35 | }; | 35 | }; |
36 | 36 | ||
37 | #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) | ||
38 | #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) | ||
39 | |||
40 | extern struct device_node *of_find_node_by_cpuid(int cpuid); | 37 | extern struct device_node *of_find_node_by_cpuid(int cpuid); |
41 | extern int of_set_property(struct device_node *node, const char *name, void *val, int len); | 38 | extern int of_set_property(struct device_node *node, const char *name, void *val, int len); |
42 | extern struct mutex of_set_property_mutex; | 39 | extern struct mutex of_set_property_mutex; |
diff --git a/include/linux/of.h b/include/linux/of.h index 65a158dc7257..a66c1eb31693 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
@@ -69,6 +69,9 @@ struct device_node { | |||
69 | #define OF_DYNAMIC 1 /* node and properties were allocated via kmalloc */ | 69 | #define OF_DYNAMIC 1 /* node and properties were allocated via kmalloc */ |
70 | #define OF_DETACHED 2 /* node has been detached from the device tree */ | 70 | #define OF_DETACHED 2 /* node has been detached from the device tree */ |
71 | 71 | ||
72 | #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) | ||
73 | #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) | ||
74 | |||
72 | #define OF_BAD_ADDR ((u64)-1) | 75 | #define OF_BAD_ADDR ((u64)-1) |
73 | 76 | ||
74 | extern struct device_node *of_find_node_by_name(struct device_node *from, | 77 | extern struct device_node *of_find_node_by_name(struct device_node *from, |