diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
| commit | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch) | |
| tree | 0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /include/linux/of.h | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 59a61bdc98b6..79886ade070f 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
| @@ -70,5 +70,6 @@ extern int of_n_addr_cells(struct device_node *np); | |||
| 70 | extern int of_n_size_cells(struct device_node *np); | 70 | extern int of_n_size_cells(struct device_node *np); |
| 71 | extern const struct of_device_id *of_match_node( | 71 | extern const struct of_device_id *of_match_node( |
| 72 | const struct of_device_id *matches, const struct device_node *node); | 72 | const struct of_device_id *matches, const struct device_node *node); |
| 73 | extern int of_modalias_node(struct device_node *node, char *modalias, int len); | ||
| 73 | 74 | ||
| 74 | #endif /* _LINUX_OF_H */ | 75 | #endif /* _LINUX_OF_H */ |