projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Yet another merge with the main repository.
[gem5.git]
/
src
/
cpu
/
inorder
/
pipeline_traits.5stage.cc
diff --git
a/src/cpu/inorder/pipeline_traits.5stage.cc
b/src/cpu/inorder/pipeline_traits.5stage.cc
index 50c30af1e3380acba7d2e7efaff57e29897f7614..f15a3cb119c9398871cfb6c5c93cc7f61c8a75f0 100644
(file)
--- a/
src/cpu/inorder/pipeline_traits.5stage.cc
+++ b/
src/cpu/inorder/pipeline_traits.5stage.cc
@@
-29,9
+29,9
@@
*
*/
-#include "cpu/inorder/pipeline_traits.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
#include "cpu/inorder/resources/resource_list.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_traits.hh"
using namespace std;