diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 20:41:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-23 20:41:44 +0200 |
| commit | 35a177a08d14f238d89d7f03918d3e0482af3240 (patch) | |
| tree | 72a71fe4cec13e079e182633a62ea9219dbde656 /fs/xfs/xfs.h | |
| parent | Merge git://git.infradead.org/users/cbou/battery-3.1 (diff) | |
| parent | xfs: fix tracing builds inside the source tree (diff) | |
| download | linux-35a177a08d14f238d89d7f03918d3e0482af3240.tar.xz 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 'fs/xfs/xfs.h')
| -rw-r--r-- | fs/xfs/xfs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h index 53ec3ea9a625..d8b11b7f94aa 100644 --- a/fs/xfs/xfs.h +++ b/fs/xfs/xfs.h @@ -24,5 +24,6 @@ #define XFS_BUF_LOCK_TRACKING 1 #endif -#include <linux-2.6/xfs_linux.h> +#include "xfs_linux.h" + #endif /* __XFS_H__ */ |