About time to just apply this and kill off the patches

[people/mcb30/busybox.git] / include / usage.h

diff --git a/include/usage.h b/include/usage.h
index ae858bd..484c015 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -1622,6 +1622,7 @@
 #define lsmod_full_usage \
        "List the currently loaded kernel modules."
 
 #define lsmod_full_usage \
        "List the currently loaded kernel modules."
 

+#ifdef CONFIG_FEATURE_MAKEDEVS_LEAF

 #define makedevs_trivial_usage \
        "NAME TYPE MAJOR MINOR FIRST LAST [s]"
 #define makedevs_full_usage \
 #define makedevs_trivial_usage \
        "NAME TYPE MAJOR MINOR FIRST LAST [s]"
 #define makedevs_full_usage \


@@ -1641,6 +1642,18 @@
        "[creates ttyS2-ttyS63]\n" \
        "# makedevs /dev/hda b 3 0 0 8 s\n" \
        "[creates hda,hda1-hda8]\n"
        "[creates ttyS2-ttyS63]\n" \
        "# makedevs /dev/hda b 3 0 0 8 s\n" \
        "[creates hda,hda1-hda8]\n"

+#endif
+
+#ifdef CONFIG_FEATURE_MAKEDEVS_TABLE
+#define makedevs_trivial_usage \
+       "[-r rootdir] [device_table]"
+#define makedevs_full_usage \
+       "Creates a batch of special files as specified in a device table\n" \
+       "The device table has one line per device group, each group is of\n" \
+       "the format\n" \
+       "\ttype mode user group major minor start increment count\n" \
+       "a '-' may be used for blank entries\n"
+#endif

 
 #ifdef CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
 #define USAGE_MD5_SHA1_SUM_CHECK(a) a
 
 #ifdef CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
 #define USAGE_MD5_SHA1_SUM_CHECK(a) a