Merge zizzer:/bk/m5 into vm1.reinhardt.house:/z/stever/bk/m5

[gem5.git] / sim / debug.hh

diff --git a/sim/debug.hh b/sim/debug.hh
index a4f8b8702dfa0f1b8c85b0f9a472ebe22c04cb8b..5ee77cf280ad81492994ce4dea5ed09ea10b3827 100644 (file)
--- a/sim/debug.hh
+++ b/sim/debug.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,10 +29,6 @@
 #ifndef __DEBUG_HH__
 #define __DEBUG_HH__
 
-#ifdef DEBUG
 void debug_break();
-#else
-inline void debug_break() { }
-#endif
 
 #endif // __DEBUG_HH__