diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 04:35:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 04:35:30 -0400 |
| commit | 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (patch) | |
| tree | a9ec5019e2b666a19874fc344ffb0dd5da6bce94 /fs/Makefile | |
| parent | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into perfcounters/core
Conflicts:
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
include/linux/init_task.h
Merge reason: the conflicts are non-trivial: PowerPC placement
of sys_perf_counter_open has to be mixed with the
new preadv/pwrite syscalls.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index 70b2aed87133..af6d04700d9c 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
| @@ -114,6 +114,7 @@ obj-$(CONFIG_JFS_FS) += jfs/ | |||
| 114 | obj-$(CONFIG_XFS_FS) += xfs/ | 114 | obj-$(CONFIG_XFS_FS) += xfs/ |
| 115 | obj-$(CONFIG_9P_FS) += 9p/ | 115 | obj-$(CONFIG_9P_FS) += 9p/ |
| 116 | obj-$(CONFIG_AFS_FS) += afs/ | 116 | obj-$(CONFIG_AFS_FS) += afs/ |
| 117 | obj-$(CONFIG_NILFS2_FS) += nilfs2/ | ||
| 117 | obj-$(CONFIG_BEFS_FS) += befs/ | 118 | obj-$(CONFIG_BEFS_FS) += befs/ |
| 118 | obj-$(CONFIG_HOSTFS) += hostfs/ | 119 | obj-$(CONFIG_HOSTFS) += hostfs/ |
| 119 | obj-$(CONFIG_HPPFS) += hppfs/ | 120 | obj-$(CONFIG_HPPFS) += hppfs/ |