diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:21:33 -0500 |
| commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
| tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /fs/xfs | |
| parent | 9979ead5d1eb23191a00453559927c5abf9087e2 (diff) | |
| parent | 4f0210b9c4889eede9f8f379f93570c01998ccb9 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/Kbuild | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/xfs/Kbuild b/fs/xfs/Kbuild new file mode 100644 index 00000000000..2566e96706f --- /dev/null +++ b/fs/xfs/Kbuild | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | # | ||
| 2 | # The xfs people like to share Makefile with 2.6 and 2.4. | ||
| 3 | # Utilise file named Kbuild file which has precedence over Makefile. | ||
| 4 | # | ||
| 5 | |||
| 6 | include $(srctree)/$(obj)/Makefile-linux-2.6 | ||