diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:53:09 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:53:09 -0500 |
commit | e169cfbef46d62e042614ffafa8880eed1d894bb (patch) | |
tree | 44982b47e17dc361783d89629fbdde751cbc35e3 /include/linux/of_fdt.h | |
parent | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (diff) |
of/flattree: merge find_flat_dt_string and initial_boot_params
Merge common code between Microblaze and PowerPC.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'include/linux/of_fdt.h')
-rw-r--r-- | include/linux/of_fdt.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 41d432b13553..d1a79f3da789 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h | |||
@@ -57,7 +57,11 @@ struct boot_param_header { | |||
57 | u32 dt_struct_size; /* size of the DT structure block */ | 57 | u32 dt_struct_size; /* size of the DT structure block */ |
58 | }; | 58 | }; |
59 | 59 | ||
60 | /* TBD: Temporary export of fdt globals - remove when code fully merged */ | ||
61 | extern struct boot_param_header *initial_boot_params; | ||
62 | |||
60 | /* For scanning the flat device-tree at boot time */ | 63 | /* For scanning the flat device-tree at boot time */ |
64 | extern char *find_flat_dt_string(u32 offset); | ||
61 | extern int __init of_scan_flat_dt(int (*it)(unsigned long node, | 65 | extern int __init of_scan_flat_dt(int (*it)(unsigned long node, |
62 | const char *uname, int depth, | 66 | const char *uname, int depth, |
63 | void *data), | 67 | void *data), |