diff options
author | merge <null@invalid> | 2008-12-10 11:12:33 +0000 |
---|---|---|
committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-10 11:12:33 +0000 |
commit | 201609904fb54abb87c9c30856a432d89567917c (patch) | |
tree | 9c0f558fe619fb691d11460586af0de3de14dbf0 /arch/arm/configs/gta02-moredrivers-defconfig | |
parent | 1ebfe80a65ee67c7985e29dcaa8acb34377fc58a (diff) |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-introduce-gta02-packaging-defc-1228907217
pending-tracking-hist top was MERGE-via-stable-tracking-introduce-gta02-packaging-defc-1228907217 / 03583f856b4029f09b7aee17e1c743cd5d50062f ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-introduce-gta02-packaging-defc
stable-tracking-hist top was introduce-gta02-packaging-defc / 893e0396e11b1b697205262dd034a0420dbad0e1 ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
introduce-gta02-packaging-defconfig
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm/configs/gta02-moredrivers-defconfig')
-rw-r--r-- | arch/arm/configs/gta02-moredrivers-defconfig | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig index f929276edd6..378bc93064a 100644 --- a/arch/arm/configs/gta02-moredrivers-defconfig +++ b/arch/arm/configs/gta02-moredrivers-defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-rc4 -# Mon Dec 8 11:17:01 2008 +# Wed Dec 10 10:58:53 2008 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -472,7 +472,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set # CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set -# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m CONFIG_NETFILTER_XT_MATCH_DCCP=m CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m @@ -1751,7 +1751,7 @@ CONFIG_JBD2=y CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set @@ -1823,7 +1823,32 @@ CONFIG_CRAMFS=y CONFIG_ROMFS_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NETWORK_FILESYSTEMS=y +# CONFIG_NFS_FS is not set +CONFIG_NFSD=y +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +# CONFIG_NFSD_V4 is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=y +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_REGISTER_V4 is not set +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set # # Partition Types |