From ea9697250cf55add36af1548b524ab22d6a2cf94 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Wed, 5 Jul 2006 16:54:24 -0400
Subject: Fix up some merge problems.

src/base/traceflags.py:
    Remove BaseCPU traceflag.
src/cpu/o3/alpha/params.hh:
    Move non-Alpha specific parameters out of this params class.
src/cpu/o3/params.hh:
    Move non-Alpha specific params into this params class.

--HG--
extra : convert_revision : e5b652adb47a240376733400e6054c66c50bd514
---
 src/base/traceflags.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/base')

diff --git a/src/base/traceflags.py b/src/base/traceflags.py
index 9ceba3017..27c24107c 100644
--- a/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@ -51,7 +51,6 @@ baseFlags = [
     'Activity',
     'AlphaConsole',
     'BADADDR',
-    'BaseCPU',
     'BE',
     'BPredRAS',
     'Bus',
-- 
cgit v1.2.3