diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /kernel/sysctl_binary.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 8cd50d8f9bde..59030570f5ca 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/file.h> | 13 | #include <linux/file.h> |
| 14 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
| 15 | #include <linux/netdevice.h> | 15 | #include <linux/netdevice.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #ifdef CONFIG_SYSCTL_SYSCALL | 18 | #ifdef CONFIG_SYSCTL_SYSCALL |
| 18 | 19 | ||