diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 11:41:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 11:41:44 -0700 |
| commit | 35a177a08d14f238d89d7f03918d3e0482af3240 (patch) | |
| tree | 72a71fe4cec13e079e182633a62ea9219dbde656 /kernel | |
| parent | a76ef86455fd8d199d482acc402675e4dcbe58fe (diff) | |
| parent | b6bede3b4cdfbd188557ab50fceec2e91d295edf (diff) | |
| download | linux-35a177a08d14f238d89d7f03918d3e0482af3240.tar.gz linux-35a177a08d14f238d89d7f03918d3e0482af3240.tar.bz2 linux-35a177a08d14f238d89d7f03918d3e0482af3240.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: fix tracing builds inside the source tree
xfs: remove subdirectories
xfs: don't expect xfs headers to be in subdirectories
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl_binary.c | 2 | ||||
| -rw-r--r-- | kernel/sysctl_check.c | 2 |
2 files changed, 2 insertions, 2 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> diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c index 4e4932a7b360..362da653813d 100644 --- a/kernel/sysctl_check.c +++ b/kernel/sysctl_check.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> |