diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 11:15:20 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 11:15:20 +0900 |
| commit | f59b51fe3d3092c08d7d554ecb40db24011b2ebc (patch) | |
| tree | f19a5cb72adda3963f83609dbe2314620a4cf63e /arch/um/drivers/chan_user.c | |
| parent | aac2b1f5747ea34696d0da5bdc4d8247aa6437af (diff) | |
| parent | 062d52672446014222942cae6934d97769b329f0 (diff) | |
| download | lwn-f59b51fe3d3092c08d7d554ecb40db24011b2ebc.tar.gz lwn-f59b51fe3d3092c08d7d554ecb40db24011b2ebc.zip | |
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/chan_user.c')
| -rw-r--r-- | arch/um/drivers/chan_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index f180813ce2c7..9be670ad23b5 100644 --- a/arch/um/drivers/chan_user.c +++ b/arch/um/drivers/chan_user.c @@ -11,8 +11,8 @@ #include <termios.h> #include <sys/ioctl.h> #include "chan_user.h" -#include "os.h" -#include "um_malloc.h" +#include <os.h> +#include <um_malloc.h> void generic_close(int fd, void *unused) { |