diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/um/drivers/stdio_console.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/drivers/stdio_console.c')
| -rw-r--r-- | arch/um/drivers/stdio_console.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 49266f6108c4..088776f01908 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
| @@ -20,8 +20,7 @@ | |||
| 20 | #include "asm/current.h" | 20 | #include "asm/current.h" |
| 21 | #include "asm/irq.h" | 21 | #include "asm/irq.h" |
| 22 | #include "stdio_console.h" | 22 | #include "stdio_console.h" |
| 23 | #include "line.h" | 23 | #include "chan.h" |
| 24 | #include "chan_kern.h" | ||
| 25 | #include "irq_user.h" | 24 | #include "irq_user.h" |
| 26 | #include "mconsole_kern.h" | 25 | #include "mconsole_kern.h" |
| 27 | #include "init.h" | 26 | #include "init.h" |