Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c
index 8d1cfb0d5068544205cdda1e516cb65636ed31bc..790057a34616357753e31539b5c27867f04a90e5 100644 (file)
--- a/arch/sparc/prom/console.c
+++ b/arch/sparc/prom/console.c
@@ -1,4 +1,4 @@
-/* $Id: console.c,v 1.25 2001/10/30 04:54:22 davem Exp $
+/*
  * console.c: Routines that deal with sending and receiving IO
  *            to/from the current console device using the PROM.
  *
@@ -17,9 +17,6 @@
 
 extern void restore_current(void);
 
-static char con_name_jmc[] = "/obio/su@"; /* "/obio/su@0,3002f8"; */
-#define CON_SIZE_JMC   (sizeof(con_name_jmc))
-
 /* Non blocking get character from console input device, returns -1
  * if no input was taken.  This can be used for polling.
  */