aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl_binary.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-20 21:45:56 +0200
committerArnd Bergmann <arnd@arndb.de>2011-09-20 21:45:56 +0200
commit1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (patch)
tree635ef73cdff38d21a529bbdcab4cd2cb39a29484 /kernel/sysctl_binary.c
parentMerge branches 'imx/cleanup' and 'stericsson/cleanup' of git+ssh://master.ker... (diff)
parentMerge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 ... (diff)
downloadlinux-1fdb4888e45f1413972a8e9da55f3ffc08b9abcb.tar.gz
linux-1fdb4888e45f1413972a8e9da55f3ffc08b9abcb.zip
Merge branch 'omap/cleanup' into next/cleanup
Diffstat (limited to 'kernel/sysctl_binary.c')
-rw-r--r--kernel/sysctl_binary.c2
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 @@
#include <linux/stat.h>
#include <linux/sysctl.h>
-#include "../fs/xfs/linux-2.6/xfs_sysctl.h"
+#include "../fs/xfs/xfs_sysctl.h"
#include <linux/sunrpc/debug.h>
#include <linux/string.h>
#include <net/ip_vs.h>