Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
diff --git a/include/linux/of.h b/include/linux/of.h
index f01ba8a..4386c5f 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -321,6 +321,11 @@
 	return NULL;
 }
 
+static inline int of_alias_get_id(struct device_node *np, const char *stem)
+{
+	return -ENOSYS;
+}
+
 #define of_match_ptr(_ptr)	NULL
 #define of_match_node(_matches, _node)	NULL
 #endif /* CONFIG_OF */