diff --git a/gdb/ocd.c b/gdb/ocd.c
index a6b385a5e2..0af8103a73 100644
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -74,10 +74,11 @@ static int last_run_status;
    other form of hairy serial connection, I would think 2 seconds would
    be plenty.  */
 
+#if 0
 /* FIXME: Change to allow option to set timeout value on a per target
-   basis.
-
+   basis. */
 static int remote_timeout = 2;
+#endif
 
 /* Descriptor for I/O to remote machine.  Initialize it to NULL so that
    ocd_open knows that we don't have a file open when the program
@@ -1288,7 +1289,9 @@ ocd_load (args, from_tty)
    not yet supported fully */
    
 #define BDM_BREAKPOINT {0x0,0x0,0x0,0x0} /* For ppc 8xx */
-/* #define BDM_BREAKPOINT {0x4a,0xfa} /* BGND insn used for CPU32 */
+#if 0
+#define BDM_BREAKPOINT {0x4a,0xfa} /* BGND insn used for CPU32 */
+#endif
 
 /* BDM (at least on CPU32) uses a different breakpoint */