aboutsummaryrefslogtreecommitdiff
path: root/arch/um/drivers/stdio_console.c
diff options
context:
space:
mode:
authorSteve French <sfrench@hera.kernel.org>2005-05-31 14:32:44 -0700
committerSteve French <sfrench@hera.kernel.org>2005-05-31 14:32:44 -0700
commitaf6f5e3247a68074e384ef93c0b4bce1b73c9d80 (patch)
tree87b0f1e48bd0ca67a78fab0fa42b37864863fdfd /arch/um/drivers/stdio_console.c
parent7e2987503dda95a5f80290bb8c06279009c2419e (diff)
parent2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (diff)
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/drivers/stdio_console.c')
-rw-r--r--arch/um/drivers/stdio_console.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 361d0be342b..afbe1e71ed8 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -28,7 +28,6 @@
#include "irq_user.h"
#include "mconsole_kern.h"
#include "init.h"
-#include "2_5compat.h"
#define MAX_TTYS (16)