diff -up lsvpd-1.6.11/docs/lsmcode.8.lsmopts lsvpd-1.6.11/docs/lsmcode.8

--- lsvpd-1.6.11/docs/lsmcode.8.lsmopts	2011-11-09 08:13:41.602999977 +0100

+++ lsvpd-1.6.11/docs/lsmcode.8	2011-11-09 08:15:44.169000483 +0100

@@ -24,7 +24,7 @@ lsmcode \- list microcode and firmware l

 .ad l

 .hy 0

 .HP 8

-\fBlsmcode\fR [\fB\-A\fR | \fB\-\-All\fR | \fB\-d<name>\fR | \fB\-\-device=<name>\fR] [\fB\-r\fR | \fB\-\-tabular\fR | \fB\-c\fR | \fB\-\-no\-menus\fR] [\fB\-p<database\-file>\fR | \fB\-\-path=<database\-file>\fR | \fB\-z<database\-archive>\fR | \fB\-\-zip=<database\-archive>\fR] [\fB\-h\fR | \fB\-\-help\fR]

+\fBlsmcode\fR [\fB\-A\fR | \fB\-\-All\fR | \fB\-d<name>\fR | \fB\-\-device=<name>\fR] [\fB\-p<database\-file>\fR | \fB\-\-path=<database\-file>\fR | \fB\-z<database\-archive>\fR | \fB\-\-zip=<database\-archive>\fR] [\fB\-h\fR | \fB\-\-help\fR]

 .ad

 .hy

@@ -50,14 +50,6 @@ Display information for all supported ha

 Only show configuration information for the component with the given \fIname\fR\&.

 .TP

-\-r|\-\-tabluar

-Display information in a tabular format\&. Overrides \fI\-c\fR\&.

-

-.TP

-\-c|\-\-no\-menus

-Display information without using menus\&. This is only included for compatibility with calling software that expects to be able to use the same options as for the AIX version, since interactive menus are not supported in this version\&.

-

-.TP

 \-p<database\-file>|\-\-path=<database\-file>

 Use <database\-file> as the hardware inventory database, rather then the default file\&. Note the supplied filename must include a full path\&. (\fI/var/lib/lsvpd/db\fR)\&.

diff -up lsvpd-1.6.11/src/output/lsmcode.cpp.lsmopts lsvpd-1.6.11/src/output/lsmcode.cpp

--- lsvpd-1.6.11/src/output/lsmcode.cpp.lsmopts	2010-07-02 20:54:08.000000000 +0200

+++ lsvpd-1.6.11/src/output/lsmcode.cpp	2011-11-09 08:07:18.581000751 +0100

@@ -66,8 +66,6 @@ void printUsage( )

 	cout << " --help,       -h     print this usage message" << endl;

 	cout << " --debug,      -D     print extra information about devices (sysfs locations, etc)" << endl;

 	cout << " --version,    -v     print the version of vpd tools" << endl;

-	cout << " --no-menus,   -c     Do not use menus.  This is the default (no menus implemented)." << endl;

-	cout << " --tabular,    -r     Use a tabular format.  Overrides -c." << endl;

 	cout << " --All,        -A     Display microcode level for as many devices as possible." << endl;

 	cout << "                      this implies -r." << endl;

 	cout << " --device=DEV, -dDEV  Only display microcode level for specified device (DEV)." << endl;

@@ -249,8 +247,6 @@ int main( int argc, char** argv )

 	{

 		{ "help", 0, 0, 'h' },

 		{ "version", 0, 0, 'v' },

-		{ "no-menus", 0, 0, 'c' },

-		{ "tabular", 0, 0, 'r' },

 		{ "All", 0, 0, 'A' },

 		{ "device", 1, 0, 'd' },

 		{ "path", 1, 0, 'p' },

@@ -268,17 +264,10 @@ int main( int argc, char** argv )

 	{

 		switch( getopt_long( argc, argv, opts, longOpts, &index ) )

 		{

-			case 'c':

-				break;

-

 			case 'v':

 				printVersion( );

 				return 0;

-			case 'r':

-				tabular = true;

-				break;

-

 			case 'A':

 				all = true;

 				tabular = true;