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/powerpc/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/powerpc/kernel/prom.c')
-rw-r--r-- | arch/powerpc/kernel/prom.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 78f65a4d8b03..048e3a3e9876 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -432,14 +432,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
432 | return 1; | 432 | return 1; |
433 | } | 433 | } |
434 | 434 | ||
435 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) | ||
436 | { | ||
437 | cell_t *p = *cellp; | ||
438 | |||
439 | *cellp = p + s; | ||
440 | return of_read_number(p, s); | ||
441 | } | ||
442 | |||
443 | #ifdef CONFIG_PPC_PSERIES | 435 | #ifdef CONFIG_PPC_PSERIES |
444 | /* | 436 | /* |
445 | * Interpret the ibm,dynamic-memory property in the | 437 | * Interpret the ibm,dynamic-memory property in the |