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

[karo-tx-linux.git] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 021db96245e718e402ab4e2dbfadf456ff4952b5..f2431091f4c1de39d4cdcac1477f5cbd40277df7 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -74,6 +74,13 @@ int of_n_size_cells(struct device_node *np)
 }
 EXPORT_SYMBOL(of_n_size_cells);
 
+#ifdef CONFIG_NUMA
+int __weak of_node_to_nid(struct device_node *np)
+{
+       return numa_node_id();
+}
+#endif
+
 #if defined(CONFIG_OF_DYNAMIC)
 /**
  *     of_node_get - Increment refcount of a node