diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-15 19:06:11 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 19:06:11 -0400 |
| commit | ceb1c532ba6220900e61ec7073a9234661efa450 (patch) | |
| tree | b7c5b94f09a6893625bb12b7795de3d44fece450 /kernel/sysctl_binary.c | |
| parent | 8f5b5a41ebc750ffcc2c410371b2b4998955709e (diff) | |
| parent | 00c46b3069c1ee9aa31db3057e9224685af52efa (diff) | |
Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into cleanup
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 3b8e028b9601..e8bffbe2ba4b 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include <linux/stat.h> | 1 | #include <linux/stat.h> |
| 2 | #include <linux/sysctl.h> | 2 | #include <linux/sysctl.h> |
| 3 | #include "../fs/xfs/linux-2.6/xfs_sysctl.h" | 3 | #include "../fs/xfs/xfs_sysctl.h" |
| 4 | #include <linux/sunrpc/debug.h> | 4 | #include <linux/sunrpc/debug.h> |
| 5 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 6 | #include <net/ip_vs.h> | 6 | #include <net/ip_vs.h> |