diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 05:37:56 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-10 17:23:15 -0500 |
commit | 83f7a06eb479e2aeb83536e77a2cb14cc2285e32 (patch) | |
tree | 3f81f85739eaa781ee17213e5d2be086fb419ff3 /arch/microblaze/kernel/prom.c | |
parent | f00abd94918c9780f9d2d961fc0e419c11457922 (diff) |
of/flattree: merge dt_mem_next_cell
Merge common code between PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 189179a9b554..e0f4c34ed0f2 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
@@ -155,14 +155,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
155 | return 1; | 155 | return 1; |
156 | } | 156 | } |
157 | 157 | ||
158 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) | ||
159 | { | ||
160 | cell_t *p = *cellp; | ||
161 | |||
162 | *cellp = p + s; | ||
163 | return of_read_number(p, s); | ||
164 | } | ||
165 | |||
166 | static int __init early_init_dt_scan_memory(unsigned long node, | 158 | static int __init early_init_dt_scan_memory(unsigned long node, |
167 | const char *uname, int depth, void *data) | 159 | const char *uname, int depth, void *data) |
168 | { | 160 | { |