diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /fs/Makefile | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index b9ffa63f77fc..9edf4112bee0 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
| @@ -94,7 +94,6 @@ obj-$(CONFIG_HPFS_FS) += hpfs/ | |||
| 94 | obj-$(CONFIG_NTFS_FS) += ntfs/ | 94 | obj-$(CONFIG_NTFS_FS) += ntfs/ |
| 95 | obj-$(CONFIG_UFS_FS) += ufs/ | 95 | obj-$(CONFIG_UFS_FS) += ufs/ |
| 96 | obj-$(CONFIG_EFS_FS) += efs/ | 96 | obj-$(CONFIG_EFS_FS) += efs/ |
| 97 | obj-$(CONFIG_JFFS_FS) += jffs/ | ||
| 98 | obj-$(CONFIG_JFFS2_FS) += jffs2/ | 97 | obj-$(CONFIG_JFFS2_FS) += jffs2/ |
| 99 | obj-$(CONFIG_AFFS_FS) += affs/ | 98 | obj-$(CONFIG_AFFS_FS) += affs/ |
| 100 | obj-$(CONFIG_ROMFS_FS) += romfs/ | 99 | obj-$(CONFIG_ROMFS_FS) += romfs/ |