summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2008-08-19 22:26:05 +0000
committerDenis Vlasenko2008-08-19 22:26:05 +0000
commit625ed8e027e703c06a82bfbb8b4e8fd4876c7779 (patch)
treed84e7107303e339853ac0389c99bd0a59762afd8
parentc77e843c0927bc4235d6d54981bcf7fdaa9f0421 (diff)
downloadbusybox-625ed8e027e703c06a82bfbb8b4e8fd4876c7779.zip
busybox-625ed8e027e703c06a82bfbb8b4e8fd4876c7779.tar.gz
Updating defconfig, fixing a typo in Config.in
-rw-r--r--TODO_config_nommu6
-rw-r--r--console-tools/Config.in2
-rw-r--r--scripts/defconfig5
3 files changed, 10 insertions, 3 deletions
diff --git a/TODO_config_nommu b/TODO_config_nommu
index 90bd5b2..8e13e1f 100644
--- a/TODO_config_nommu
+++ b/TODO_config_nommu
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.0.svn
-# Tue Aug 5 14:43:04 2008
+# Wed Aug 20 00:24:07 2008
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -13,6 +13,7 @@ CONFIG_HAVE_DOT_CONFIG=y
# General Configuration
#
CONFIG_DESKTOP=y
+# CONFIG_EXTRA_COMPAT is not set
CONFIG_FEATURE_ASSUME_UNICODE=y
CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
@@ -281,8 +282,10 @@ CONFIG_RESIZE=y
CONFIG_FEATURE_RESIZE_PRINT=y
CONFIG_SETCONSOLE=y
CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETFONT=y
CONFIG_SETKEYCODES=y
CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
#
# Debian Utilities
@@ -520,6 +523,7 @@ CONFIG_FEATURE_MOUNT_FLAGS=y
CONFIG_FEATURE_MOUNT_FSTAB=y
CONFIG_PIVOT_ROOT=y
CONFIG_RDATE=y
+CONFIG_RDEV=y
CONFIG_READPROFILE=y
CONFIG_RTCWAKE=y
CONFIG_SCRIPT=y
diff --git a/console-tools/Config.in b/console-tools/Config.in
index a08ee42..254e2f7 100644
--- a/console-tools/Config.in
+++ b/console-tools/Config.in
@@ -118,6 +118,6 @@ config SHOWKEY
bool "showkey"
default n
help
- Shows keys presses.
+ Shows keys pressed.
endmenu
diff --git a/scripts/defconfig b/scripts/defconfig
index a3e98a1..686974b 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.0.svn
-# Tue Aug 5 14:44:22 2008
+# Wed Aug 20 00:19:25 2008
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -13,6 +13,7 @@ CONFIG_HAVE_DOT_CONFIG=y
# General Configuration
#
# CONFIG_DESKTOP is not set
+# CONFIG_EXTRA_COMPAT is not set
# CONFIG_FEATURE_ASSUME_UNICODE is not set
CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
@@ -281,8 +282,10 @@ CONFIG_RESIZE=y
CONFIG_FEATURE_RESIZE_PRINT=y
CONFIG_SETCONSOLE=y
CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
+CONFIG_SETFONT=y
CONFIG_SETKEYCODES=y
CONFIG_SETLOGCONS=y
+CONFIG_SHOWKEY=y
#
# Debian Utilities