diff options
| author | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-08 01:48:33 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-08 01:48:33 +0200 |
| commit | 9295e7abc68aea6b3ecd8191fa01e4661f281481 (patch) | |
| tree | 6cb37186a52392e3c35f35119e3ccbfd4e9db27d | |
| parent | 993d229c19beb3a3d093d6063e3c72959496d316 (diff) | |
| parent | 3c043b61989275acdfa7bd6ebe6c3a69af123612 (diff) | |
Merge change Iad6f6f66 into android-tegra-2.6.29
* changes:
tegra: add kernel DHCP and NFS root support for whistler
| -rw-r--r-- | arch/arm/configs/tegra_whistler_gnu_linux_defconfig | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig index fea4a002dc79..5dffc7af956a 100644 --- a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29 -# Tue Dec 22 16:09:29 2009 +# Thu Jan 7 15:12:17 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -199,6 +199,7 @@ CONFIG_TEGRA_SYSTEM_DMA=y # CONFIG_MACH_TEGRA_GENERIC_DEBUG is not set CONFIG_TEGRA_ODM_RFKILL=y # CONFIG_TEGRA_NVEC is not set +# CONFIG_TEGRA_PCI is not set # CONFIG_TEGRA_ODM_HARMONY is not set CONFIG_TEGRA_ODM_WHISTLER=y # CONFIG_TEGRA_ODM_CONCORDE is not set @@ -364,12 +365,16 @@ CONFIG_XFRM=y # CONFIG_XFRM_MIGRATE is not set # CONFIG_XFRM_STATISTICS is not set CONFIG_XFRM_IPCOMP=y -# CONFIG_NET_KEY is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set @@ -1012,6 +1017,7 @@ CONFIG_USB_HID=y # # Special HID drivers # +# CONFIG_USB_KEYBOARD_USES_COMMON_NAME is not set CONFIG_HID_COMPAT=y CONFIG_HID_A4TECH=y CONFIG_HID_APPLE=y @@ -1291,7 +1297,7 @@ CONFIG_JBD=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_GFS2_FS is not set @@ -1367,11 +1373,13 @@ CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V3_ACL=y # CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y # CONFIG_NFSD is not set CONFIG_LOCKD=y CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y # CONFIG_SUNRPC_REGISTER_V4 is not set |