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>

diff --git a/TODO_config_nommu b/TODO_config_nommu
index 9c3e864455d0ce77e3d477556d1053ab873ea2a6..6714307edf9290cfd013eb830bdf60620a75aa2c 100644 (file)
--- 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 078b8641b2a8cc5cb4044bea7a71fbd57861d473..f8b7eac6b984d393865b8e0cd0cda19046c67ff1 100644 (file)
--- 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 b97be8b22e6dc2bd9ce2eb693ae3128f9f7a7bd1..559e4c17a3752fad1e513b332d1aaeebfad55fca 100644 (file)
--- 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