diff --git a/acsApp/src/AcsRegister.cc b/acsApp/src/AcsRegister.cc
index d0cffca..5e594ea 100644
--- a/acsApp/src/AcsRegister.cc
+++ b/acsApp/src/AcsRegister.cc
@@ -2,9 +2,9 @@
 FILENAME...	AcsRegister.cc
 USAGE...	Register ACS motor device driver shell commands.
 
-Version:	$Revision: 1.3 $
-Modified By:	$Author: rivers $
-Last Modified:	$Date: 2004-06-08 22:32:58 $
+Version:	$Revision: 1.4 $
+Modified By:	$Author: sluiter $
+Last Modified:	$Date: 2004-07-16 19:06:58 $
 */
 
 /*****************************************************************
@@ -27,22 +27,20 @@ extern "C"
 
 // ACS Setup arguments
 static const iocshArg setupArg0 = {"Max. controller count", iocshArgInt};
-static const iocshArg setupArg1 = {"N/A", iocshArgInt};
-static const iocshArg setupArg2 = {"Polling rate", iocshArgInt};
+static const iocshArg setupArg1 = {"Polling rate", iocshArgInt};
 // ACS Config arguments
 static const iocshArg configArg0 = {"Card being configured", iocshArgInt};
 static const iocshArg configArg1 = {"asyn port name", iocshArgString};
 
-static const iocshArg * const MCB4BSetupArgs[3]  = {&setupArg0, &setupArg1,
-    &setupArg2};
+static const iocshArg * const MCB4BSetupArgs[2]  = {&setupArg0, &setupArg1};
 static const iocshArg * const MCB4BConfigArgs[2] = {&configArg0, &configArg1};
 
-static const iocshFuncDef setupMCB4B  = {"MCB4BSetup",  3, MCB4BSetupArgs};
+static const iocshFuncDef setupMCB4B  = {"MCB4BSetup",  2, MCB4BSetupArgs};
 static const iocshFuncDef configMCB4B = {"MCB4BConfig", 2, MCB4BConfigArgs};
 
 static void setupMCB4BCallFunc(const iocshArgBuf *args)
 {
-    MCB4BSetup(args[0].ival, args[1].ival, args[2].ival);
+    MCB4BSetup(args[0].ival, args[1].ival);
 }
 static void configMCB4BCallFunc(const iocshArgBuf *args)
 {
diff --git a/acsApp/src/AcsRegister.h b/acsApp/src/AcsRegister.h
index af76720..c4ceab1 100644
--- a/acsApp/src/AcsRegister.h
+++ b/acsApp/src/AcsRegister.h
@@ -2,9 +2,9 @@
 FILENAME...	AcsRegister.h
 USAGE... This file contains function prototypes for ACS IOC shell commands.
 
-Version:	$Revision: 1.2 $
-Modified By:	$Author: rivers $
-Last Modified:	$Date: 2004-04-20 20:50:12 $
+Version:	$Revision: 1.3 $
+Modified By:	$Author: sluiter $
+Last Modified:	$Date: 2004-07-16 19:06:58 $
 */
 
 /*
@@ -40,6 +40,6 @@ Last Modified:	$Date: 2004-04-20 20:50:12 $
 #include "motordrvCom.h"
 
 /* Function prototypes. */
-extern RTN_STATUS MCB4BSetup(int, int, int);
+extern RTN_STATUS MCB4BSetup(int, int);
 extern RTN_STATUS MCB4BConfig(int, const char *);
 
diff --git a/acsApp/src/drvMCB4B.cc b/acsApp/src/drvMCB4B.cc
index 805b45e..fa57df3 100644
--- a/acsApp/src/drvMCB4B.cc
+++ b/acsApp/src/drvMCB4B.cc
@@ -11,6 +11,8 @@
  * .02  07-03-2002   rls  replaced RA_OVERTRAVEL with RA_PLUS_LS and RA_MINUS_LS
  * .03  05-23-2003   rls  Converted to R3.14.x.
  * .04  02-03-2004   rls  Eliminate erroneous "Motor motion timeout ERROR".
+ * .05  07-09-2004   rls  - removed unused <driver>Setup() argument.
+ *                        - added "\" at end of long Debug stmt's for SunPro.
  */
 
 
@@ -297,7 +299,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char c)
     strcpy(buff, com);
     strcat(buff, OUTPUT_TERMINATOR);
 
-    Debug(2, "send_mess: sending message to card %d, message=%s\n",
+    Debug(2, "send_mess: sending message to card %d, message=%s\n",\
                      card, buff);
 
     pasynSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT);
@@ -326,7 +328,7 @@ STATIC int recv_mess(int card, char *com, int flag)
 
     cntrl = (struct MCB4Bcontroller *) motor_state[card]->DevicePrivate;
 
-    Debug(3, "recv_mess entry: card %d, flag=%d\n", 
+    Debug(3, "recv_mess entry: card %d, flag=%d\n",\
             card, flag);
     if (flag == FLUSH) {
         flush = 1;
@@ -343,15 +345,15 @@ STATIC int recv_mess(int card, char *com, int flag)
     else com[len-1] = '\0';
     
     if (len > 0) {
-        Debug(2, "recv_mess: card %d, message = \"%s\"\n", 
+        Debug(2, "recv_mess: card %d, message = \"%s\"\n",\
                    card, com);
     }
     if (len == 0) {
         if (flag != FLUSH)  {
-            Debug(1, "recv_mess: card %d ERROR: no response\n", 
+            Debug(1, "recv_mess: card %d ERROR: no response\n",\
                   card);
         } else {
-            Debug(3, "recv_mess: card %d flush returned no characters\n", 
+            Debug(3, "recv_mess: card %d flush returned no characters\n",\
                   card);
         }
     }
@@ -367,7 +369,6 @@ STATIC int recv_mess(int card, char *com, int flag)
 /*****************************************************/
 RTN_STATUS
 MCB4BSetup(int num_cards,   	/* maximum number of controllers in system */
-           int num_channels,	/* NOT USED            */
            int scan_rate)       /* polling rate - 1/60 sec units */
 {
     int itera;
@@ -459,7 +460,7 @@ STATIC int motor_init()
         /* Initialize communications channel */
 
 	success_rtn = pasynSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
-        Debug(1, "motor_init, return from pasynSyncIO->connect for port %s = %d, pasynUser=%p\n", 
+        Debug(1, "motor_init, return from pasynSyncIO->connect for port %s = %d, pasynUser=%p\n",\
               cntrl->port, success_rtn, cntrl->pasynUser);
 
         if (success_rtn == 0)