diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 10:58:57 -0500 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 10:58:57 -0500 |
| commit | a52079dad4718fa924ae81a939f8a665366f562b (patch) | |
| tree | a9d6004f9bf1beff49cbfe0d5bf6edbf621b065d /fs/Makefile | |
| parent | 24c8d0804be00da90af9efa8eb404bd7a3284ba9 (diff) | |
| parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
Orangefs: Merge tag 'v4.4-rc1' into for-next
Linux 4.4-rc1
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/Makefile b/fs/Makefile index b4406d6f7da1..f0f2f00951f5 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
| @@ -63,10 +63,11 @@ obj-$(CONFIG_DLM) += dlm/ | |||
| 63 | # Do not add any filesystems before this line | 63 | # Do not add any filesystems before this line |
| 64 | obj-$(CONFIG_FSCACHE) += fscache/ | 64 | obj-$(CONFIG_FSCACHE) += fscache/ |
| 65 | obj-$(CONFIG_REISERFS_FS) += reiserfs/ | 65 | obj-$(CONFIG_REISERFS_FS) += reiserfs/ |
| 66 | obj-$(CONFIG_EXT2_FS) += ext2/ | ||
| 67 | # We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2 | ||
| 68 | # unless explicitly requested by rootfstype | ||
| 69 | obj-$(CONFIG_EXT4_FS) += ext4/ | 66 | obj-$(CONFIG_EXT4_FS) += ext4/ |
| 67 | # We place ext4 before ext2 so that clean ext3 root fs's do NOT mount using the | ||
| 68 | # ext2 driver, which doesn't know about journalling! Explicitly request ext2 | ||
| 69 | # by giving the rootfstype= parameter. | ||
| 70 | obj-$(CONFIG_EXT2_FS) += ext2/ | ||
| 70 | obj-$(CONFIG_JBD2) += jbd2/ | 71 | obj-$(CONFIG_JBD2) += jbd2/ |
| 71 | obj-$(CONFIG_CRAMFS) += cramfs/ | 72 | obj-$(CONFIG_CRAMFS) += cramfs/ |
| 72 | obj-$(CONFIG_SQUASHFS) += squashfs/ | 73 | obj-$(CONFIG_SQUASHFS) += squashfs/ |