diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-13 21:16:56 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-09-13 21:16:56 -0700 |
| commit | fc8e1ead9314cf0e0f1922e661428b93d3a50d88 (patch) | |
| tree | f3cb97c4769b74f6627a59769f1ed5c92a13c58a /arch/sparc/kernel/prom_common.c | |
| parent | 2bcaa6a4238094c5695d5b1943078388d82d3004 (diff) | |
| parent | 9de48cc300fb10f7d9faa978670becf5e352462a (diff) | |
| download | kernel-crypto-fc8e1ead9314cf0e0f1922e661428b93d3a50d88.tar.gz kernel-crypto-fc8e1ead9314cf0e0f1922e661428b93d3a50d88.tar.xz kernel-crypto-fc8e1ead9314cf0e0f1922e661428b93d3a50d88.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/sparc/kernel/prom_common.c')
| -rw-r--r-- | arch/sparc/kernel/prom_common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index ff7b591c894..0fb5789d43c 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c @@ -313,6 +313,4 @@ void __init prom_build_devicetree(void) printk("PROM: Built device tree with %u bytes of memory.\n", prom_early_allocated); - - of_fill_in_cpu_data(); } |