summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-06-19 11:45:01 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-06-19 11:45:01 (GMT)
commit8e5d83b6c1d91e4e61d340656338597ab1dea3f9 (patch)
tree7c086b069bd4325adf2a9759408eda9f540373e9
parentbeca96ffa7b19ceb8439a678743c8ee35bb60509 (diff)
downloadbusybox-8e5d83b6c1d91e4e61d340656338597ab1dea3f9.tar.gz
busybox-8e5d83b6c1d91e4e61d340656338597ab1dea3f9.tar.bz2
mkswap: remove configuration for v0 support
mkswap hasn't had v0 support since commit d893b120bae5a9bdef4cfda2df5e62867d6b1cd0; it doesn't seem to make sense to offer it for configuration. Signed-off-by: Colin Watson <cjwatson@ubuntu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-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 9c3e864..6714307 100644
--- a/TODO_config_nommu
+++ b/TODO_config_nommu
@@ -494,7 +494,6 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
CONFIG_FEATURE_MDEV_EXEC=y
CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
CONFIG_MKSWAP=y
-CONFIG_FEATURE_MKSWAP_V0=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_VOLUMEID=y
diff --git a/scripts/defconfig b/scripts/defconfig
index 078b864..f8b7eac 100644
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -502,7 +502,6 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
CONFIG_FEATURE_MDEV_EXEC=y
CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
CONFIG_MKSWAP=y
-CONFIG_FEATURE_MKSWAP_V0=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_VOLUMEID=y
diff --git a/util-linux/Config.in b/util-linux/Config.in
index b97be8b..559e4c1 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -406,16 +406,6 @@ config MKSWAP
Once you have created swap space using 'mkswap' you need to enable
the swap space using the 'swapon' utility.
-config FEATURE_MKSWAP_V0
- bool "Version 0 support"
- default n
- depends on MKSWAP
-# depends on MKSWAP && DEPRECATED
- help
- Enable support for the old v0 style.
- If your kernel is older than 2.1.117, then v0 support is the
- only option.
-
config FEATURE_MKSWAP_UUID
bool "UUID support"
default n