From 635035ca64e9c6e6ad8252545446bbf9bc2a9c55 Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 1 Sep 2009 15:20:39 -0500
Subject: PR10552: Removed references to the merge ('-M') option. * hash.cxx
 (find_script_hash): Removed unused merge option. * main.cxx (checkOptions):
 Removed merge option checks.   (main): Removed merge option. * session.h:
 Ditto. * initscript/README.initscript: Removed reference to '-M' option. *
 initscript/systemtap.in (stap_getopt): Ditto. *
 testsuite/parseko/cmdline01.stp: Removed merge option test. *
 testsuite/parseko/cmdline05.stp: Ditto.

---
 initscript/systemtap.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'initscript/systemtap.in')

diff --git a/initscript/systemtap.in b/initscript/systemtap.in
index 7552df44..21bcd65b 100644
--- a/initscript/systemtap.in
+++ b/initscript/systemtap.in
@@ -287,7 +287,7 @@ stap_getopt () { # opts
   # TODO: support quoted options
   getopt -s bash -u \
          -l 'kelf,kmap::,ignore-vmlinux,ignore-dwarf,vp:' \
-         -o 'hVMvtp:I:e:o:R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:' -- $@
+         -o 'hVvtp:I:e:o:R:r:m:kgPc:x:D:bs:uqwl:d:L:FS:' -- $@
   ret=$?
   [ $ret -ne 0 ] && slog "Failed to parse parameters. ($@)"
   return $ret
-- 
cgit