diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/linux/of.h | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 47734ffd9745..6df80e985914 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
| @@ -54,7 +54,6 @@ extern int of_device_is_compatible(const struct device_node *device, | |||
| 54 | extern const void *of_get_property(const struct device_node *node, | 54 | extern const void *of_get_property(const struct device_node *node, |
| 55 | const char *name, | 55 | const char *name, |
| 56 | int *lenp); | 56 | int *lenp); |
| 57 | #define get_property(a, b, c) of_get_property((a), (b), (c)) | ||
| 58 | extern int of_n_addr_cells(struct device_node *np); | 57 | extern int of_n_addr_cells(struct device_node *np); |
| 59 | extern int of_n_size_cells(struct device_node *np); | 58 | extern int of_n_size_cells(struct device_node *np); |
| 60 | 59 | ||