[PATCH 2/2] UBUNTU: [Config] Sync fs with master (AUFS, CODA, EXT2, LOGFS and NFS)

[Paolo Pisati]

For more information and out of sync options, see here:
https://wiki.ubuntu.com/KernelTeam/Specs/PreciseKernelConfigReviewBeta2omap4

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.ti-omap4/config/config.common.ubuntu |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 44bd4df..4023d09 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -252,7 +252,7 @@ CONFIG_AUFS_BR_HFSPLUS=y
 CONFIG_AUFS_BR_RAMFS=y
 # CONFIG_AUFS_DEBUG is not set
 # CONFIG_AUFS_EXPORT is not set
-CONFIG_AUFS_FS=y
+CONFIG_AUFS_FS=m
 # CONFIG_AUFS_HNOTIFY is not set
 CONFIG_AUFS_POLL=y
 # CONFIG_AUFS_PROC_MAP is not set
@@ -402,7 +402,6 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BT=m
-CONFIG_BTREE=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_BT_ATH3K=m
@@ -536,7 +535,7 @@ CONFIG_CMDLINE="console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootwait mem=1G"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CODA_FS is not set
+CONFIG_CODA_FS=m
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_CONFIGFS_FS=m
@@ -938,7 +937,7 @@ CONFIG_EXOFS_FS=m
 CONFIG_EXPERIMENTAL=y
 CONFIG_EXPERT=y
 CONFIG_EXPORTFS=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XATTR=y
@@ -1802,12 +1801,12 @@ CONFIG_LLC2=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCAL_TIMERS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCKUP_DETECTOR is not set
 # CONFIG_LOCK_STAT is not set
-CONFIG_LOGFS=m
+# CONFIG_LOGFS is not set
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -2301,9 +2300,9 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -2722,7 +2721,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
 CONFIG_ROMFS_FS=m
 CONFIG_ROMFS_ON_BLOCK=y
-CONFIG_ROOT_NFS=y
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_RPS=y
@@ -3292,8 +3290,8 @@ CONFIG_STOP_MACHINE=y
 CONFIG_STP=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-- 
1.7.9.1