diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:43:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:43:13 -0700 |
commit | c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab (patch) | |
tree | ca3a211950c7511609ba3f01ec11831d90882f22 /arch/sparc64/prom/init.c | |
parent | a36f4961952214bdfc396e035a047268ac48c5c3 (diff) | |
parent | 017fb98e70351e9fb5635c299c4d1c50e2f8b823 (diff) | |
download | op-kernel-dev-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.zip op-kernel-dev-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/prom/init.c')
-rw-r--r-- | arch/sparc64/prom/init.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc64/prom/init.c b/arch/sparc64/prom/init.c index 8b4b622..f3cc2d8 100644 --- a/arch/sparc64/prom/init.c +++ b/arch/sparc64/prom/init.c @@ -27,7 +27,6 @@ int prom_chosen_node; * failure. It gets passed the pointer to the PROM vector. */ -extern void prom_meminit(void); extern void prom_cif_init(void *, void *); void __init prom_init(void *cif_handler, void *cif_stack) @@ -90,8 +89,6 @@ void __init prom_init(void *cif_handler, void *cif_stack) printk ("PROMLIB: Sun IEEE Boot Prom %s\n", buffer + bufadjust); - prom_meminit(); - /* Initialization successful. */ return; |