aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2021-08-17 08:26:36 +0100
committerRon Yorston <rmy@pobox.com>2021-08-17 08:26:36 +0100
commitf13defb1c8f892ecf3e8dd5dbe486cc2b53e6f03 (patch)
tree15c9c174532e433e5632637c541d09e591c01d60 /configs
parent41f31584037be6b9d74a89245dff9ad8f0db146f (diff)
parent540aa116615713ad53e5ac98850993162e27c32d (diff)
downloadbusybox-w32-f13defb1c8f892ecf3e8dd5dbe486cc2b53e6f03.tar.gz
busybox-w32-f13defb1c8f892ecf3e8dd5dbe486cc2b53e6f03.tar.bz2
busybox-w32-f13defb1c8f892ecf3e8dd5dbe486cc2b53e6f03.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'configs')
-rw-r--r--configs/android_502_defconfig2
-rw-r--r--configs/android_ndk_defconfig1
2 files changed, 0 insertions, 3 deletions
diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig
index 503157c12..104e70f23 100644
--- a/configs/android_502_defconfig
+++ b/configs/android_502_defconfig
@@ -33,7 +33,6 @@
33## Assorted header problems: 33## Assorted header problems:
34## # CONFIG_HOSTID is not set 34## # CONFIG_HOSTID is not set
35## # CONFIG_FEATURE_SYNC_FANCY is not set - syncfs() 35## # CONFIG_FEATURE_SYNC_FANCY is not set - syncfs()
36## # CONFIG_FEATURE_TOUCH_NODEREF is not set - lutimes()
37## # CONFIG_LOGNAME is not set - getlogin_r() 36## # CONFIG_LOGNAME is not set - getlogin_r()
38## # CONFIG_LOADFONT is not set 37## # CONFIG_LOADFONT is not set
39## # CONFIG_SETFONT is not set 38## # CONFIG_SETFONT is not set
@@ -269,7 +268,6 @@ CONFIG_SYNC=y
269CONFIG_TEST=y 268CONFIG_TEST=y
270CONFIG_FEATURE_TEST_64=y 269CONFIG_FEATURE_TEST_64=y
271CONFIG_TOUCH=y 270CONFIG_TOUCH=y
272# CONFIG_FEATURE_TOUCH_NODEREF is not set
273CONFIG_FEATURE_TOUCH_SUSV3=y 271CONFIG_FEATURE_TOUCH_SUSV3=y
274CONFIG_TR=y 272CONFIG_TR=y
275CONFIG_FEATURE_TR_CLASSES=y 273CONFIG_FEATURE_TR_CLASSES=y
diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig
index 03d497d2e..425593454 100644
--- a/configs/android_ndk_defconfig
+++ b/configs/android_ndk_defconfig
@@ -193,7 +193,6 @@ CONFIG_SYNC=y
193CONFIG_TEST=y 193CONFIG_TEST=y
194CONFIG_FEATURE_TEST_64=y 194CONFIG_FEATURE_TEST_64=y
195CONFIG_TOUCH=y 195CONFIG_TOUCH=y
196# CONFIG_FEATURE_TOUCH_NODEREF is not set
197CONFIG_FEATURE_TOUCH_SUSV3=y 196CONFIG_FEATURE_TOUCH_SUSV3=y
198CONFIG_TR=y 197CONFIG_TR=y
199CONFIG_FEATURE_TR_CLASSES=y 198CONFIG_FEATURE_TR_CLASSES=y