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/os-Linux/drivers/tuntap_kern.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/os-Linux/drivers/tuntap_kern.c')
| -rw-r--r-- | arch/um/os-Linux/drivers/tuntap_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c index 4048800e4696..d9d56e5810fe 100644 --- a/arch/um/os-Linux/drivers/tuntap_kern.c +++ b/arch/um/os-Linux/drivers/tuntap_kern.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/skbuff.h> | 8 | #include <linux/skbuff.h> |
| 9 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
| 10 | #include "net_kern.h" | 10 | #include <net_kern.h> |
| 11 | #include "tuntap.h" | 11 | #include "tuntap.h" |
| 12 | 12 | ||
| 13 | struct tuntap_init { | 13 | struct tuntap_init { |