diff options
| author | Jeremy Kerr <jeremy.kerr@canonical.com> | 2010-02-14 09:13:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-14 09:13:43 -0500 |
| commit | 9dfbf207802c7e8cda9d081a8d750b50633c82d2 (patch) | |
| tree | 618b86e4d33263272d70159d33d3b25f24921d79 /include/linux | |
| parent | 7c540d9e3da38c3d1c15fb8059e4577a84ac0066 (diff) | |
of: protect linux/of.h with CONFIG_OF
For platforms that have CONFIG_OF optional, we need to make the contents
of linux/of.h conditional on CONFIG_OF.
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 5c7b6a64acd9..48b0ee6d0f76 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
| @@ -22,6 +22,8 @@ | |||
| 22 | 22 | ||
| 23 | #include <asm/byteorder.h> | 23 | #include <asm/byteorder.h> |
| 24 | 24 | ||
| 25 | #ifdef CONFIG_OF | ||
| 26 | |||
| 25 | typedef u32 phandle; | 27 | typedef u32 phandle; |
| 26 | typedef u32 ihandle; | 28 | typedef u32 ihandle; |
| 27 | 29 | ||
| @@ -194,4 +196,5 @@ extern void of_attach_node(struct device_node *); | |||
| 194 | extern void of_detach_node(struct device_node *); | 196 | extern void of_detach_node(struct device_node *); |
| 195 | #endif | 197 | #endif |
| 196 | 198 | ||
| 199 | #endif /* CONFIG_OF */ | ||
| 197 | #endif /* _LINUX_OF_H */ | 200 | #endif /* _LINUX_OF_H */ |
