diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-01 19:34:51 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-12-01 19:34:51 -0800 |
| commit | 745f0044cd65d476b3b190377989eb0af3738df5 (patch) | |
| tree | bc29a2944891cdfa20edeebe80e3a4ea08c0e3a7 /cpu/simple_cpu/simple_cpu.cc | |
| parent | 5b24b5a5c5d336eb1594e65826caf2a28da3ede1 (diff) | |
| parent | 7976794aadd7f308010f88aa3a8a6e3469e37ba7 (diff) | |
| download | gem5-745f0044cd65d476b3b190377989eb0af3738df5.tar.xz | |
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : d66ebc598fdcfc9477ea5a1e455b21d7b9e56936
Diffstat (limited to 'cpu/simple_cpu/simple_cpu.cc')
| -rw-r--r-- | cpu/simple_cpu/simple_cpu.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpu/simple_cpu/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc index a63f86098..476f28ea0 100644 --- a/cpu/simple_cpu/simple_cpu.cc +++ b/cpu/simple_cpu/simple_cpu.cc @@ -70,7 +70,6 @@ #else // !FULL_SYSTEM #include "eio/eio.hh" #include "mem/functional_mem/functional_memory.hh" -#include "sim/prog.hh" #endif // FULL_SYSTEM using namespace std; |