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/ssl.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/drivers/ssl.c')
| -rw-r--r-- | arch/um/drivers/ssl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index f1786e64607f..9d8c20af6f80 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
| @@ -12,10 +12,8 @@ | |||
| 12 | #include "linux/console.h" | 12 | #include "linux/console.h" |
| 13 | #include "asm/termbits.h" | 13 | #include "asm/termbits.h" |
| 14 | #include "asm/irq.h" | 14 | #include "asm/irq.h" |
| 15 | #include "line.h" | ||
| 16 | #include "ssl.h" | 15 | #include "ssl.h" |
| 17 | #include "chan_kern.h" | 16 | #include "chan.h" |
| 18 | #include "kern.h" | ||
| 19 | #include "init.h" | 17 | #include "init.h" |
| 20 | #include "irq_user.h" | 18 | #include "irq_user.h" |
| 21 | #include "mconsole_kern.h" | 19 | #include "mconsole_kern.h" |