Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

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

diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c
index 790057a34616357753e31539b5c27867f04a90e5..b3075d73fc19e7f2bf765a4cff144aa27683334b 100644 (file)
--- a/arch/sparc/prom/console.c
+++ b/arch/sparc/prom/console.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <asm/openprom.h>
-#include <asm/sun4prom.h>
 #include <asm/oplib.h>
 #include <asm/system.h>
 #include <linux/string.h>
@@ -30,7 +29,6 @@ prom_nbgetchar(void)
        spin_lock_irqsave(&prom_lock, flags);
        switch(prom_vers) {
        case PROM_V0:
-       case PROM_SUN4:
                i = (*(romvec->pv_nbgetchar))();
                break;
        case PROM_V2:
@@ -63,7 +61,6 @@ prom_nbputchar(char c)
        spin_lock_irqsave(&prom_lock, flags);
        switch(prom_vers) {
        case PROM_V0:
-       case PROM_SUN4:
                i = (*(romvec->pv_nbputchar))(c);
                break;
        case PROM_V2: