From d6187df3e20741c40373356c6a505a64706f772a Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Thu, 15 Oct 2009 10:57:51 -0600 Subject: [PATCH] --- yaml --- r: 170045 b: refs/heads/master c: 61e955db539e748cff2b8ea3bf7705259ebe9fb6 h: refs/heads/master i: 170043: afdad0a7a500ae33056db6625c5cfa69d6279d6b v: v3 --- [refs] | 2 +- trunk/arch/sparc/include/asm/prom.h | 3 --- trunk/include/linux/of.h | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bd347f5c7fd8..ae91c5902d79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f1924928377bd035a9f64466f91a487c69271d2 +refs/heads/master: 61e955db539e748cff2b8ea3bf7705259ebe9fb6 diff --git a/trunk/arch/sparc/include/asm/prom.h b/trunk/arch/sparc/include/asm/prom.h index e5f4a1d8fc46..ddbd870b5720 100644 --- a/trunk/arch/sparc/include/asm/prom.h +++ b/trunk/arch/sparc/include/asm/prom.h @@ -34,9 +34,6 @@ struct of_irq_controller { void *data; }; -#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) -#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) - extern struct device_node *of_find_node_by_cpuid(int cpuid); extern int of_set_property(struct device_node *node, const char *name, void *val, int len); extern struct mutex of_set_property_mutex; diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h index 65a158dc7257..a66c1eb31693 100644 --- a/trunk/include/linux/of.h +++ b/trunk/include/linux/of.h @@ -69,6 +69,9 @@ struct device_node { #define OF_DYNAMIC 1 /* node and properties were allocated via kmalloc */ #define OF_DETACHED 2 /* node has been detached from the device tree */ +#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) +#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) + #define OF_BAD_ADDR ((u64)-1) extern struct device_node *of_find_node_by_name(struct device_node *from,