diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-24 20:14:32 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-24 20:14:32 +0000 |
commit | a545726d2baa08b28510336b32d85de91df51d9e (patch) | |
tree | 22be96f507e7e1079526bdacef5e081455b2243f | |
parent | d9c6a001e3356656ab3bc31f18778602484075e0 (diff) | |
download | busybox-w32-a545726d2baa08b28510336b32d85de91df51d9e.tar.gz busybox-w32-a545726d2baa08b28510336b32d85de91df51d9e.tar.bz2 busybox-w32-a545726d2baa08b28510336b32d85de91df51d9e.zip |
insmod: fix help text to not show options if only 2.6 was selected
-rw-r--r-- | include/usage.h | 9 | ||||
-rw-r--r-- | modutils/insmod.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/usage.h b/include/usage.h index eb1a6415f..09c8fa7d1 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -1584,9 +1584,10 @@ | |||
1584 | " ::shutdown:/sbin/swapoff -a\n" | 1584 | " ::shutdown:/sbin/swapoff -a\n" |
1585 | 1585 | ||
1586 | #define insmod_trivial_usage \ | 1586 | #define insmod_trivial_usage \ |
1587 | "[OPTION]... MODULE [symbol=value]..." | 1587 | USE_FEATURE_2_4_MODULES("[OPTION]... ") "MODULE [symbol=value]..." |
1588 | #define insmod_full_usage \ | 1588 | #define insmod_full_usage \ |
1589 | "Load the specified kernel modules into the kernel" \ | 1589 | "Load the specified kernel modules into the kernel" \ |
1590 | USE_FEATURE_2_4_MODULES( \ | ||
1590 | "\n\nOptions:\n" \ | 1591 | "\n\nOptions:\n" \ |
1591 | " -f Force module to load into the wrong kernel version\n" \ | 1592 | " -f Force module to load into the wrong kernel version\n" \ |
1592 | " -k Make module autoclean-able\n" \ | 1593 | " -k Make module autoclean-able\n" \ |
@@ -1594,9 +1595,11 @@ | |||
1594 | " -q Quiet\n" \ | 1595 | " -q Quiet\n" \ |
1595 | " -L Lock to prevent simultaneous loads of a module\n" \ | 1596 | " -L Lock to prevent simultaneous loads of a module\n" \ |
1596 | USE_FEATURE_INSMOD_LOAD_MAP( \ | 1597 | USE_FEATURE_INSMOD_LOAD_MAP( \ |
1597 | " -m Output load map to stdout\n") \ | 1598 | " -m Output load map to stdout\n" \ |
1599 | ) \ | ||
1598 | " -o NAME Set internal module name to NAME\n" \ | 1600 | " -o NAME Set internal module name to NAME\n" \ |
1599 | " -x Do not export externs" | 1601 | " -x Do not export externs" \ |
1602 | ) | ||
1600 | 1603 | ||
1601 | #define install_trivial_usage \ | 1604 | #define install_trivial_usage \ |
1602 | "[-cgmops] [sources] dest|directory" | 1605 | "[-cgmops] [sources] dest|directory" |
diff --git a/modutils/insmod.c b/modutils/insmod.c index 3c8bb41bb..d7e4bef68 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -72,7 +72,7 @@ | |||
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #if ENABLE_FEATURE_2_6_MODULES | 74 | #if ENABLE_FEATURE_2_6_MODULES |
75 | extern int insmod_ng_main( int argc, char **argv); | 75 | extern int insmod_ng_main(int argc, char **argv); |
76 | #endif | 76 | #endif |
77 | 77 | ||
78 | 78 | ||