diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 13:07:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 13:07:28 -0400 |
| commit | ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (patch) | |
| tree | 3666d029b4bd4df2909dbefd9c7a09e6042b7d32 /arch/um/drivers/stdio_console.c | |
| parent | 8bf62ecee58360749c5f0e68bc97d5e02a6816b1 (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge upstream kernel changes into 'C/H/S support' branch of libata.
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 | ||