aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 14:58:54 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 14:58:54 +0100
commitf560422fa079b07a761a572ca4f9cf287c2cc47e (patch)
tree6962fe92683c37e561363eed6da8b60c09842196 /util-linux
parentf10f7a21d40d5ce0846414973e88602a59d4580e (diff)
downloadbusybox-f560422fa079b07a761a572ca4f9cf287c2cc47e.tar.gz
Big cleanup in config help and description
Redundant help texts (one which only repeats the description) are deleted. Descriptions and help texts are trimmed. Some config options are moved, even across menus. No config option _names_ are changed. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/Config.src2
-rw-r--r--util-linux/dmesg.c2
-rw-r--r--util-linux/fbset.c4
-rw-r--r--util-linux/fdisk.c2
-rw-r--r--util-linux/hwclock.c4
-rw-r--r--util-linux/mount.c2
-rw-r--r--util-linux/volume_id/bcache.c4
-rw-r--r--util-linux/volume_id/btrfs.c4
-rw-r--r--util-linux/volume_id/cramfs.c4
-rw-r--r--util-linux/volume_id/exfat.c2
-rw-r--r--util-linux/volume_id/ext.c4
-rw-r--r--util-linux/volume_id/f2fs.c2
-rw-r--r--util-linux/volume_id/fat.c4
-rw-r--r--util-linux/volume_id/hfs.c4
-rw-r--r--util-linux/volume_id/iso9660.c4
-rw-r--r--util-linux/volume_id/jfs.c4
-rw-r--r--util-linux/volume_id/linux_raid.c4
-rw-r--r--util-linux/volume_id/linux_swap.c4
-rw-r--r--util-linux/volume_id/luks.c4
-rw-r--r--util-linux/volume_id/nilfs.c2
-rw-r--r--util-linux/volume_id/ntfs.c4
-rw-r--r--util-linux/volume_id/ocfs2.c4
-rw-r--r--util-linux/volume_id/reiserfs.c4
-rw-r--r--util-linux/volume_id/romfs.c4
-rw-r--r--util-linux/volume_id/squashfs.c2
-rw-r--r--util-linux/volume_id/sysv.c4
-rw-r--r--util-linux/volume_id/ubifs.c2
-rw-r--r--util-linux/volume_id/udf.c4
-rw-r--r--util-linux/volume_id/unused_highpoint.c4
-rw-r--r--util-linux/volume_id/unused_hpfs.c4
-rw-r--r--util-linux/volume_id/unused_isw_raid.c4
-rw-r--r--util-linux/volume_id/unused_lsi_raid.c4
-rw-r--r--util-linux/volume_id/unused_lvm.c4
-rw-r--r--util-linux/volume_id/unused_mac.c4
-rw-r--r--util-linux/volume_id/unused_minix.c4
-rw-r--r--util-linux/volume_id/unused_msdos.c4
-rw-r--r--util-linux/volume_id/unused_nvidia_raid.c4
-rw-r--r--util-linux/volume_id/unused_promise_raid.c4
-rw-r--r--util-linux/volume_id/unused_silicon_raid.c4
-rw-r--r--util-linux/volume_id/unused_ufs.c4
-rw-r--r--util-linux/volume_id/unused_via_raid.c4
-rw-r--r--util-linux/volume_id/xfs.c4
42 files changed, 5 insertions, 145 deletions
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 3c522f948..0971d714a 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -40,7 +40,7 @@ config FEATURE_MOUNT_LOOP_CREATE
if it does not find a free one.
config FEATURE_MTAB_SUPPORT
- bool "Support for the old /etc/mtab file"
+ bool "Support old /etc/mtab file"
default n
depends on MOUNT || UMOUNT
select FEATURE_MOUNT_FAKE
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index b7b2c6924..c3574f8f5 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -22,7 +22,7 @@
//config: wish to enable the 'dmesg' utility.
//config:
//config:config FEATURE_DMESG_PRETTY
-//config: bool "Pretty dmesg output"
+//config: bool "Pretty output"
//config: default y
//config: depends on DMESG
//config: help
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 8a78c1ef9..673bf9aa4 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -22,7 +22,7 @@
//config: if you wish to enable the 'fbset' utility.
//config:
//config:config FEATURE_FBSET_FANCY
-//config: bool "Turn on extra fbset options"
+//config: bool "Enable extra options"
//config: default y
//config: depends on FBSET
//config: help
@@ -32,7 +32,7 @@
//config: options.
//config:
//config:config FEATURE_FBSET_READMODE
-//config: bool "Turn on fbset readmode support"
+//config: bool "Enable readmode support"
//config: default y
//config: depends on FBSET
//config: help
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index b988e65a9..54f37baa6 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -21,8 +21,6 @@
//config: default y
//config: depends on FDISK
//config: depends on !LFS # with LFS no special code is needed
-//config: help
-//config: Enable this option to support large disks > 4GB.
//config:
//config:config FEATURE_FDISK_WRITABLE
//config: bool "Write support"
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 084a7f1e9..d65011a71 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -20,10 +20,6 @@
//config: bool "Support long options (--hctosys,...)"
//config: default y
//config: depends on HWCLOCK && LONG_OPTS
-//config: help
-//config: By default, the hwclock utility only uses short options. If you
-//config: are overly fond of its long options, such as --hctosys, --utc, etc)
-//config: then enable this option.
//config:
//config:config FEATURE_HWCLOCK_ADJTIME_FHS
//config: bool "Use FHS /var/lib/hwclock/adjtime"
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 42962b859..4f5dced10 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -90,7 +90,7 @@
//config:
//config:config FEATURE_MOUNT_FLAGS
//config: depends on MOUNT
-//config: bool "Support lots of -o flags in mount"
+//config: bool "Support lots of -o flags"
//config: default y
//config: help
//config: Without this, mount only supports ro/rw/remount. With this, it
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index fd40eb081..334a341c3 100644
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@@ -10,14 +10,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o
-//config:
//config:config FEATURE_VOLUMEID_BCACHE
//config: bool "bcache filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index e4dddf26d..338a48762 100644
--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@@ -21,14 +21,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
-//config:
//config:config FEATURE_VOLUMEID_BTRFS
//config: bool "btrfs filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index aeb7f20ac..c63223e2b 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
-//config:
//config:config FEATURE_VOLUMEID_CRAMFS
//config: bool "cramfs filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index c3aa36804..7ed13a70e 100644
--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@@ -20,7 +20,6 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
-//config:
//config:config FEATURE_VOLUMEID_EXFAT
//config: bool "exFAT filesystem"
//config: default y
@@ -29,7 +28,6 @@
//config: exFAT (extended FAT) is a proprietary file system designed especially
//config: for flash drives. It has many features from NTFS, but with less
//config: overhead. exFAT is used on most SDXC cards for consumer electronics.
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index df39d9342..473b3229a 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
-//config:
//config:config FEATURE_VOLUMEID_EXT
//config: bool "Ext filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
#include "bb_e2fs_defs.h"
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
index bf0b66278..1d3bdae36 100644
--- a/util-linux/volume_id/f2fs.c
+++ b/util-linux/volume_id/f2fs.c
@@ -8,7 +8,6 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o
-//config:
//config:config FEATURE_VOLUMEID_F2FS
//config: bool "f2fs filesystem"
//config: default y
@@ -18,7 +17,6 @@
//config: which is adapted to newer forms of storage. F2FS also remedies some
//config: known issues of the older log structured file systems, such as high
//config: cleaning overhead.
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index 476d500a6..bc3433daf 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
-//config:
//config:config FEATURE_VOLUMEID_FAT
//config: bool "fat filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 8d34aaf68..78dae0790 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
-//config:
//config:config FEATURE_VOLUMEID_HFS
//config: bool "hfs filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 3848de453..23072f87c 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
-//config:
//config:config FEATURE_VOLUMEID_ISO9660
//config: bool "iso9660 filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index a6eaff45b..543d90fe5 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
-//config:
//config:config FEATURE_VOLUMEID_JFS
//config: bool "jfs filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index f20823a6e..0db6e8662 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
-//config:
//config:config FEATURE_VOLUMEID_LINUXRAID
//config: bool "linuxraid"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 39470d48c..a35769dfc 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
-//config:
//config:config FEATURE_VOLUMEID_LINUXSWAP
//config: bool "linux swap filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 21cb26f51..4b80b7a6d 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
-//config:
//config:config FEATURE_VOLUMEID_LUKS
//config: bool "luks filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index f3a9ef58d..ffe919f36 100644
--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@@ -21,7 +21,6 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
-//config:
//config:config FEATURE_VOLUMEID_NILFS
//config: bool "nilfs filesystem"
//config: default y
@@ -37,7 +36,6 @@
//config: SOX compliance logging, and so forth. It can serve as an alternative
//config: filesystem for Linux desktop environment, or as a basis of advanced
//config: storage appliances.
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index 46f687a56..bf85f7ed3 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
-//config:
//config:config FEATURE_VOLUMEID_NTFS
//config: bool "ntfs filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index 415e0bf61..2dedac98b 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
-//config:
//config:config FEATURE_VOLUMEID_OCFS2
//config: bool "ocfs2 filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 24979fb1c..369d4d9bb 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -21,14 +21,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
-//config:
//config:config FEATURE_VOLUMEID_REISERFS
//config: bool "Reiser filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 4754fdb37..95a65f9ef 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
-//config:
//config:config FEATURE_VOLUMEID_ROMFS
//config: bool "romfs filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index 079b6cc31..6bba199cd 100644
--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@@ -8,7 +8,6 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
-//config:
//config:config FEATURE_VOLUMEID_SQUASHFS
//config: bool "SquashFS filesystem"
//config: default y
@@ -18,7 +17,6 @@
//config: intended for general read-only filesystem use and in constrained block
//config: device/memory systems (e.g. embedded systems) where low overhead is
//config: needed.
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index 7b4b5360b..cd4cd906b 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
-//config:
//config:config FEATURE_VOLUMEID_SYSV
//config: bool "sysv filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c
index 13604ec35..99b0aa830 100644
--- a/util-linux/volume_id/ubifs.c
+++ b/util-linux/volume_id/ubifs.c
@@ -8,7 +8,6 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o
-//config:
//config:config FEATURE_VOLUMEID_UBIFS
//config: bool "UBIFS filesystem"
//config: default y
@@ -16,7 +15,6 @@
//config: help
//config: UBIFS (Unsorted Block Image File System) is a file
//config: system for use with raw flash memory media.
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index 921454503..613c80c86 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
-//config:
//config:config FEATURE_VOLUMEID_UDF
//config: bool "udf filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c
index 7231a1db2..4afa6d927 100644
--- a/util-linux/volume_id/unused_highpoint.c
+++ b/util-linux/volume_id/unused_highpoint.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
-//config:
//config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
//config:### bool "highpoint raid"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c
index a87c89fb3..3e16dedbd 100644
--- a/util-linux/volume_id/unused_hpfs.c
+++ b/util-linux/volume_id/unused_hpfs.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
-//config:
//config:### config FEATURE_VOLUMEID_HPFS
//config:### bool "hpfs filesystem"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c
index 851bd2f8f..fba99be58 100644
--- a/util-linux/volume_id/unused_isw_raid.c
+++ b/util-linux/volume_id/unused_isw_raid.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
-//config:
//config:### config FEATURE_VOLUMEID_ISWRAID
//config:### bool "intel raid"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c
index 52d68deab..9dd2b409c 100644
--- a/util-linux/volume_id/unused_lsi_raid.c
+++ b/util-linux/volume_id/unused_lsi_raid.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
-//config:
//config:### config FEATURE_VOLUMEID_LSIRAID
//config:### bool "lsi raid"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c
index 08fa05243..5ad6d585c 100644
--- a/util-linux/volume_id/unused_lvm.c
+++ b/util-linux/volume_id/unused_lvm.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
-//config:
//config:### config FEATURE_VOLUMEID_LVM
//config:### bool "lvm"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c
index a1a53d1fb..997d330a4 100644
--- a/util-linux/volume_id/unused_mac.c
+++ b/util-linux/volume_id/unused_mac.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
-//config:
//config:### config FEATURE_VOLUMEID_MAC
//config:### bool "mac filesystem"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/unused_minix.c
index 50afd5c3e..443dbc272 100644
--- a/util-linux/volume_id/unused_minix.c
+++ b/util-linux/volume_id/unused_minix.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
-//config:
//config:### config FEATURE_VOLUMEID_MINIX
//config:### bool "minix filesystem"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
index 5ebaa3eef..f84c0f06f 100644
--- a/util-linux/volume_id/unused_msdos.c
+++ b/util-linux/volume_id/unused_msdos.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
-//config:
//config:### config FEATURE_VOLUMEID_MSDOS
//config:### bool "msdos filesystem"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c
index d99a108f3..dfb54fa9d 100644
--- a/util-linux/volume_id/unused_nvidia_raid.c
+++ b/util-linux/volume_id/unused_nvidia_raid.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
-//config:
//config:### config FEATURE_VOLUMEID_NVIDIARAID
//config:### bool "nvidia raid"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c
index cebebe35f..d594de39c 100644
--- a/util-linux/volume_id/unused_promise_raid.c
+++ b/util-linux/volume_id/unused_promise_raid.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
-//config:
//config:### config FEATURE_VOLUMEID_PROMISERAID
//config:### bool "promise raid"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c
index 40c8faa9e..886721b61 100644
--- a/util-linux/volume_id/unused_silicon_raid.c
+++ b/util-linux/volume_id/unused_silicon_raid.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
-//config:
//config:### config FEATURE_VOLUMEID_SILICONRAID
//config:### bool "silicon raid"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c
index d33c10fc4..78ef26ad4 100644
--- a/util-linux/volume_id/unused_ufs.c
+++ b/util-linux/volume_id/unused_ufs.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
-//config:
//config:### config FEATURE_VOLUMEID_UFS
//config:### bool "ufs filesystem"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c
index 258f93a4f..f82626655 100644
--- a/util-linux/volume_id/unused_via_raid.c
+++ b/util-linux/volume_id/unused_via_raid.c
@@ -20,14 +20,10 @@
//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
-//config:
//config:### config FEATURE_VOLUMEID_VIARAID
//config:### bool "via raid"
//config:### default y
//config:### depends on VOLUMEID
-//config:### help
-//config:### TODO
-//config:
#include "volume_id_internal.h"
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 5eefc201d..656d5bfcf 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -20,14 +20,10 @@
//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
-//config:
//config:config FEATURE_VOLUMEID_XFS
//config: bool "xfs filesystem"
//config: default y
//config: depends on VOLUMEID
-//config: help
-//config: TODO
-//config:
#include "volume_id_internal.h"