Merge branch 'busybox' into merge

1 files changed, 1 insertions, 2 deletions

diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index a5b3e99f7..b02fb09bd 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -62,7 +62,7 @@ enum {
 };
 
 #define OD_GETOPT32() getopt32(argv, \
-        "A:N:abcdfhij:lot:vxsS:w::", \
+        "A:N:abcdfhij:lot:*vxsS:w:+:", \
         /* -w with optional param */ \
         /* -S was -s and also had optional parameter */ \
         /* but in coreutils 6.3 it was renamed and now has */ \
@@ -1219,7 +1219,6 @@ int od_main(int argc UNUSED_PARAM, char **argv)
         address_pad_len_char = '7';
 
         /* Parse command line */
-        opt_complementary = "w+:t::"; /* -w N, -t is a list */
 #if ENABLE_LONG_OPTS
         applet_long_options = od_longopts;
 #endif