fb: convert lock/unlock_kernel() into local fb mutex

[linux-2.6-omap-h63xx.git] / arch / sparc / prom / init.c

diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c
index 2fa3a474e3a251a4bdee596a2f9369952d27f520..873217c6d8234a7396aef8a36d07f706bafcba9d 100644 (file)
--- a/arch/sparc/prom/init.c
+++ b/arch/sparc/prom/init.c
@@ -1,4 +1,4 @@
-/* $Id: init.c,v 1.14 2000/01/29 01:09:12 anton Exp $
+/*
  * init.c:  Initialize internal variables used by the PROM
  *          library functions.
  *
@@ -11,12 +11,10 @@
 
 #include <asm/openprom.h>
 #include <asm/oplib.h>
-#include <asm/sun4prom.h>
 
 struct linux_romvec *romvec;
 enum prom_major_version prom_vers;
 unsigned int prom_rev, prom_prev;
-linux_sun4_romvec *sun4_romvec;
 
 /* The root node of the prom device tree. */
 int prom_root_node;
@@ -34,10 +32,6 @@ extern void prom_ranges_init(void);
 
 void __init prom_init(struct linux_romvec *rp)
 {
-#ifdef CONFIG_SUN4
-       extern struct linux_romvec *sun4_prom_init(void);
-       rp = sun4_prom_init();
-#endif
        romvec = rp;
 
        switch(romvec->pv_romvers) {
@@ -50,9 +44,6 @@ void __init prom_init(struct linux_romvec *rp)
        case 3:
                prom_vers = PROM_V3;
                break;
-       case 40:
-               prom_vers = PROM_SUN4;
-               break;
        default:
                prom_printf("PROMLIB: Bad PROM version %d\n",
                            romvec->pv_romvers);
@@ -76,11 +67,8 @@ void __init prom_init(struct linux_romvec *rp)
 
        prom_ranges_init();
 
-#ifndef CONFIG_SUN4
-       /* SUN4 prints this in sun4_prom_init */
        printk("PROMLIB: Sun Boot Prom Version %d Revision %d\n",
               romvec->pv_romvers, prom_rev);
-#endif
 
        /* Initialization successful. */
        return;