diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-31 11:50:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-31 11:50:32 -0400 |
| commit | edb3e182b6f33c91ba8778e2198220c12712d3ad (patch) | |
| tree | 6b741e144c2c83e901a325e5373dc0b8baf88534 /arch/um/drivers/stdio_console.c | |
| parent | 8973a585aec125beb2a3de50bb491004299f53d5 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'arch/um/drivers/stdio_console.c')
| -rw-r--r-- | arch/um/drivers/stdio_console.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 361d0be342b3..afbe1e71ed83 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include "irq_user.h" | 28 | #include "irq_user.h" |
| 29 | #include "mconsole_kern.h" | 29 | #include "mconsole_kern.h" |
| 30 | #include "init.h" | 30 | #include "init.h" |
| 31 | #include "2_5compat.h" | ||
| 32 | 31 | ||
| 33 | #define MAX_TTYS (16) | 32 | #define MAX_TTYS (16) |
| 34 | 33 | ||