aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO_config_nommu1
-rw-r--r--scripts/defconfig1
-rw-r--r--util-linux/Config.in10
3 files changed, 0 insertions, 12 deletions
diff --git a/TODO_config_nommu b/TODO_config_nommu
index 9c3e86445..6714307ed 100644
--- a/TODO_config_nommu
+++ b/TODO_config_nommu
@@ -494,7 +494,6 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
494CONFIG_FEATURE_MDEV_EXEC=y 494CONFIG_FEATURE_MDEV_EXEC=y
495CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y 495CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
496CONFIG_MKSWAP=y 496CONFIG_MKSWAP=y
497CONFIG_FEATURE_MKSWAP_V0=y
498CONFIG_MORE=y 497CONFIG_MORE=y
499CONFIG_FEATURE_USE_TERMIOS=y 498CONFIG_FEATURE_USE_TERMIOS=y
500CONFIG_VOLUMEID=y 499CONFIG_VOLUMEID=y
diff --git a/scripts/defconfig b/scripts/defconfig
index 078b8641b..f8b7eac6b 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -502,7 +502,6 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
502CONFIG_FEATURE_MDEV_EXEC=y 502CONFIG_FEATURE_MDEV_EXEC=y
503CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y 503CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
504CONFIG_MKSWAP=y 504CONFIG_MKSWAP=y
505CONFIG_FEATURE_MKSWAP_V0=y
506CONFIG_MORE=y 505CONFIG_MORE=y
507CONFIG_FEATURE_USE_TERMIOS=y 506CONFIG_FEATURE_USE_TERMIOS=y
508CONFIG_VOLUMEID=y 507CONFIG_VOLUMEID=y
diff --git a/util-linux/Config.in b/util-linux/Config.in
index b97be8b22..559e4c17a 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -406,16 +406,6 @@ config MKSWAP
406 Once you have created swap space using 'mkswap' you need to enable 406 Once you have created swap space using 'mkswap' you need to enable
407 the swap space using the 'swapon' utility. 407 the swap space using the 'swapon' utility.
408 408
409config FEATURE_MKSWAP_V0
410 bool "Version 0 support"
411 default n
412 depends on MKSWAP
413# depends on MKSWAP && DEPRECATED
414 help
415 Enable support for the old v0 style.
416 If your kernel is older than 2.1.117, then v0 support is the
417 only option.
418
419config FEATURE_MKSWAP_UUID 409config FEATURE_MKSWAP_UUID
420 bool "UUID support" 410 bool "UUID support"
421 default n 411 default n