diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /include/linux/of.h | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 */ |