aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Fandrich <dan@coneharvesters.com>2011-11-06 15:06:16 -0800
committerDenys Vlasenko <vda.linux@googlemail.com>2011-11-21 14:27:35 +0100
commitfcb9e07eca65b98093dd0b2b80451934a8719914 (patch)
tree797e22787f2ca10b9cc62d3c0c5dd697d8a6b278
parent5f118ff8851adb8370e8f130bb2ec2e80b55246c (diff)
downloadbusybox-w32-fcb9e07eca65b98093dd0b2b80451934a8719914.tar.gz
busybox-w32-fcb9e07eca65b98093dd0b2b80451934a8719914.tar.bz2
busybox-w32-fcb9e07eca65b98093dd0b2b80451934a8719914.zip
Added a few more features to android_defconfig
Signed-off-by: Daniel Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--configs/android_defconfig10
1 files changed, 5 insertions, 5 deletions
diff --git a/configs/android_defconfig b/configs/android_defconfig
index b9df0ea02..f1263b964 100644
--- a/configs/android_defconfig
+++ b/configs/android_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Busybox version: 1.20.0.git 3# Busybox version: 1.20.0.git
4# Wed Nov 2 17:54:00 2011 4# Sun Nov 6 07:51:38 2011
5# 5#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -790,7 +790,7 @@ CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
790CONFIG_FEATURE_IFUPDOWN_IPV4=y 790CONFIG_FEATURE_IFUPDOWN_IPV4=y
791# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set 791# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
792CONFIG_FEATURE_IFUPDOWN_MAPPING=y 792CONFIG_FEATURE_IFUPDOWN_MAPPING=y
793# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set 793CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
794# CONFIG_INETD is not set 794# CONFIG_INETD is not set
795# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set 795# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
796# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set 796# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
@@ -841,9 +841,9 @@ CONFIG_FEATURE_TFTP_PUT=y
841CONFIG_FEATURE_TFTP_BLOCKSIZE=y 841CONFIG_FEATURE_TFTP_BLOCKSIZE=y
842CONFIG_FEATURE_TFTP_PROGRESS_BAR=y 842CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
843# CONFIG_TFTP_DEBUG is not set 843# CONFIG_TFTP_DEBUG is not set
844# CONFIG_TRACEROUTE is not set 844CONFIG_TRACEROUTE=y
845# CONFIG_TRACEROUTE6 is not set 845# CONFIG_TRACEROUTE6 is not set
846# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set 846CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
847# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set 847# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
848# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set 848# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
849CONFIG_TUNCTL=y 849CONFIG_TUNCTL=y
@@ -856,7 +856,7 @@ CONFIG_FEATURE_TUNCTL_UG=y
856CONFIG_DHCPD_LEASES_FILE="" 856CONFIG_DHCPD_LEASES_FILE=""
857CONFIG_UDHCPC=y 857CONFIG_UDHCPC=y
858CONFIG_FEATURE_UDHCPC_ARPING=y 858CONFIG_FEATURE_UDHCPC_ARPING=y
859# CONFIG_FEATURE_UDHCP_PORT is not set 859CONFIG_FEATURE_UDHCP_PORT=y
860CONFIG_UDHCP_DEBUG=9 860CONFIG_UDHCP_DEBUG=9
861CONFIG_FEATURE_UDHCP_RFC3397=y 861CONFIG_FEATURE_UDHCP_RFC3397=y
862CONFIG_FEATURE_UDHCP_8021Q=y 862CONFIG_FEATURE_UDHCP_8021Q=y