Merge remote-tracking branch 'robh/for-next' into devicetree/next

[uclinux-h8/linux.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index 54f8587..2507617 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -672,7 +672,10 @@ static inline void of_property_clear_flag(struct property *p, unsigned long flag
 #if defined(CONFIG_OF) && defined(CONFIG_NUMA)
 extern int of_node_to_nid(struct device_node *np);
 #else
-static inline int of_node_to_nid(struct device_node *device) { return 0; }
+static inline int of_node_to_nid(struct device_node *device)
+{
+       return NUMA_NO_NODE;
+}
 #endif
 
 static inline struct device_node *of_find_matching_node(