aboutsummaryrefslogtreecommitdiffstats
path: root/fs/Makefile.rej
diff options
context:
space:
mode:
Diffstat (limited to 'fs/Makefile.rej')
-rw-r--r--fs/Makefile.rej6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/Makefile.rej b/fs/Makefile.rej
new file mode 100644
index 000000000000..10121e2eec8f
--- /dev/null
+++ b/fs/Makefile.rej
@@ -0,0 +1,6 @@
+diff a/fs/Makefile b/fs/Makefile (rejected hunks)
+@@ -128,3 +128,4 @@ obj-y += exofs/ # Multiple modules
+ obj-$(CONFIG_CEPH_FS) += ceph/
+ obj-$(CONFIG_PSTORE) += pstore/
+ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
++obj-$(CONFIG_AUFS_FS) += aufs/