diff options
| author | Linus Torvalds | 2012-10-10 04:15:20 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-10-10 04:15:20 +0200 |
| commit | f59b51fe3d3092c08d7d554ecb40db24011b2ebc (patch) | |
| tree | f19a5cb72adda3963f83609dbe2314620a4cf63e /arch/um/drivers/slip_kern.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | typo in UserModeLinux-HOWTO (diff) | |
| download | kernel-qcow2-linux-f59b51fe3d3092c08d7d554ecb40db24011b2ebc.tar.gz kernel-qcow2-linux-f59b51fe3d3092c08d7d554ecb40db24011b2ebc.tar.xz kernel-qcow2-linux-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/slip_kern.c')
| -rw-r--r-- | arch/um/drivers/slip_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c index dd2aadc14af0..ed5249fc0574 100644 --- a/arch/um/drivers/slip_kern.c +++ b/arch/um/drivers/slip_kern.c @@ -6,7 +6,7 @@ #include <linux/if_arp.h> #include <linux/init.h> #include <linux/netdevice.h> -#include "net_kern.h" +#include <net_kern.h> #include "slip.h" struct slip_init { |