diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 22:15:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 22:15:20 -0400 |
commit | f59b51fe3d3092c08d7d554ecb40db24011b2ebc (patch) | |
tree | f19a5cb72adda3963f83609dbe2314620a4cf63e /arch/um/drivers/stdio_console.c | |
parent | aac2b1f5747ea34696d0da5bdc4d8247aa6437af (diff) | |
parent | 062d52672446014222942cae6934d97769b329f0 (diff) |
Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"UML receives this time only cleanups.
The most outstanding change is the 'include "foo.h"' do 'include
<foo.h>' conversion done by Al Viro.
It touches many files, that's why the diffstat is rather big."
* 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
typo in UserModeLinux-HOWTO
hppfs: fix the return value of get_inode()
hostfs: drop vmtruncate
um: get rid of pointless include "..." where include <...> will do
um: move sysrq.h out of include/shared
um/x86: merge 32 and 64 bit variants of ptrace.h
um/x86: merge 32 and 64bit variants of checksum.h
Diffstat (limited to 'arch/um/drivers/stdio_console.c')
-rw-r--r-- | arch/um/drivers/stdio_console.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index 929b99a261f3..827777af3f6d 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
@@ -3,27 +3,27 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "linux/posix_types.h" | 6 | #include <linux/posix_types.h> |
7 | #include "linux/tty.h" | 7 | #include <linux/tty.h> |
8 | #include "linux/tty_flip.h" | 8 | #include <linux/tty_flip.h> |
9 | #include "linux/types.h" | 9 | #include <linux/types.h> |
10 | #include "linux/major.h" | 10 | #include <linux/major.h> |
11 | #include "linux/kdev_t.h" | 11 | #include <linux/kdev_t.h> |
12 | #include "linux/console.h" | 12 | #include <linux/console.h> |
13 | #include "linux/string.h" | 13 | #include <linux/string.h> |
14 | #include "linux/sched.h" | 14 | #include <linux/sched.h> |
15 | #include "linux/list.h" | 15 | #include <linux/list.h> |
16 | #include "linux/init.h" | 16 | #include <linux/init.h> |
17 | #include "linux/interrupt.h" | 17 | #include <linux/interrupt.h> |
18 | #include "linux/slab.h" | 18 | #include <linux/slab.h> |
19 | #include "linux/hardirq.h" | 19 | #include <linux/hardirq.h> |
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 "chan.h" | 23 | #include "chan.h" |
24 | #include "irq_user.h" | 24 | #include <irq_user.h> |
25 | #include "mconsole_kern.h" | 25 | #include "mconsole_kern.h" |
26 | #include "init.h" | 26 | #include <init.h> |
27 | 27 | ||
28 | #define MAX_TTYS (16) | 28 | #define MAX_TTYS (16) |
29 | 29 | ||