diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/Makefile | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index af6d04700d9c..97f340f14ba2 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
| @@ -99,6 +99,7 @@ obj-$(CONFIG_NTFS_FS) += ntfs/ | |||
| 99 | obj-$(CONFIG_UFS_FS) += ufs/ | 99 | obj-$(CONFIG_UFS_FS) += ufs/ |
| 100 | obj-$(CONFIG_EFS_FS) += efs/ | 100 | obj-$(CONFIG_EFS_FS) += efs/ |
| 101 | obj-$(CONFIG_JFFS2_FS) += jffs2/ | 101 | obj-$(CONFIG_JFFS2_FS) += jffs2/ |
| 102 | obj-$(CONFIG_LOGFS) += logfs/ | ||
| 102 | obj-$(CONFIG_UBIFS_FS) += ubifs/ | 103 | obj-$(CONFIG_UBIFS_FS) += ubifs/ |
| 103 | obj-$(CONFIG_AFFS_FS) += affs/ | 104 | obj-$(CONFIG_AFFS_FS) += affs/ |
| 104 | obj-$(CONFIG_ROMFS_FS) += romfs/ | 105 | obj-$(CONFIG_ROMFS_FS) += romfs/ |
| @@ -124,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2/ | |||
| 124 | obj-$(CONFIG_BTRFS_FS) += btrfs/ | 125 | obj-$(CONFIG_BTRFS_FS) += btrfs/ |
| 125 | obj-$(CONFIG_GFS2_FS) += gfs2/ | 126 | obj-$(CONFIG_GFS2_FS) += gfs2/ |
| 126 | obj-$(CONFIG_EXOFS_FS) += exofs/ | 127 | obj-$(CONFIG_EXOFS_FS) += exofs/ |
| 128 | obj-$(CONFIG_CEPH_FS) += ceph/ | ||