summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-04 07:49:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-04 07:49:29 -0700
commit6b1506c66809ddf6afd17e330db2999c878b5d90 (patch)
treeeb93535fcc3e568ffabd5400b019463633ea2c22 /include
parent1a67a573b8d9f02211f36fbab50f6265dc49384a (diff)
parent50e07f888cb24b55e0d8283f631907794dd757c2 (diff)
downloadlinux-6b1506c66809ddf6afd17e330db2999c878b5d90.tar.bz2
Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6: dt: add empty of_machine_is_compatible ahci: add DT binding for Calxeda AHCI controller dt/platform: minor cleanup dt: add empty of_alias_get_id() for non-dt builds
Diffstat (limited to 'include')
-rw-r--r--include/linux/of.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index f01ba8a209c0..0e89aa0bf07a 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -321,6 +321,16 @@ static inline struct device_node *of_parse_phandle(struct device_node *np,
return NULL;
}
+static inline int of_alias_get_id(struct device_node *np, const char *stem)
+{
+ return -ENOSYS;
+}
+
+static inline int of_machine_is_compatible(const char *compat)
+{
+ return 0;
+}
+
#define of_match_ptr(_ptr) NULL
#define of_match_node(_matches, _node) NULL
#endif /* CONFIG_OF */