diff options
| author | Daniel Drake <dsd@laptop.org> | 2011-03-13 15:10:17 +0000 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-03-15 14:17:23 -0700 |
| commit | 45bb1674b976ef81429c1e42de05844b49d45dea (patch) | |
| tree | 51030fa434bed1756d24d6b7595dfc7bb2be2f7b /arch/x86/include | |
| parent | 25874a299ef8037df03ce4ada570bc4e42f9748f (diff) | |
| download | blackbird-op-linux-45bb1674b976ef81429c1e42de05844b49d45dea.tar.gz blackbird-op-linux-45bb1674b976ef81429c1e42de05844b49d45dea.zip | |
x86, olpc: Use device tree for platform identification
Make OLPC fully depend on device tree, and use it to identify the OLPC
platform details. Some nodes are exposed as platform devices where we
plan to use device tree for device probing.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
LKML-Reference: <20110313151017.C255F9D401E@zog.reactivated.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/olpc_ofw.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h index c5d3a5abbb9f..24487712e0b1 100644 --- a/arch/x86/include/asm/olpc_ofw.h +++ b/arch/x86/include/asm/olpc_ofw.h @@ -26,15 +26,12 @@ extern void setup_olpc_ofw_pgd(void); /* check if OFW was detected during boot */ extern bool olpc_ofw_present(void); +extern void olpc_dt_build_devicetree(void); + #else /* !CONFIG_OLPC */ static inline void olpc_ofw_detect(void) { } static inline void setup_olpc_ofw_pgd(void) { } -#endif /* !CONFIG_OLPC */ - -#ifdef CONFIG_OF_PROMTREE -extern void olpc_dt_build_devicetree(void); -#else static inline void olpc_dt_build_devicetree(void) { } -#endif +#endif /* !CONFIG_OLPC */ #endif /* _ASM_X86_OLPC_OFW_H */ |
