Yet another merge with the main repository.

[gem5.git] / src / cpu / inorder / resources / branch_predictor.hh

diff --git a/src/cpu/inorder/resources/branch_predictor.hh b/src/cpu/inorder/resources/branch_predictor.hh
index 00915fd0dead424ef328bc93b203e06e43ff1673..72b21680662dffe47916fe6494faabaea08cc828 100644 (file)
--- a/src/cpu/inorder/resources/branch_predictor.hh
+++ b/src/cpu/inorder/resources/branch_predictor.hh
@@ -32,15 +32,15 @@
 #ifndef __CPU_INORDER_BRANCH_PREDICTOR_HH__
 #define __CPU_INORDER_BRANCH_PREDICTOR_HH__
 
-#include <vector>
 #include <list>
 #include <string>
+#include <vector>
 
-#include "cpu/inorder/resource.hh"
-#include "cpu/inorder/inorder_dyn_inst.hh"
-#include "cpu/inorder/pipeline_traits.hh"
 #include "cpu/inorder/resources/bpred_unit.hh"
 #include "cpu/inorder/cpu.hh"
+#include "cpu/inorder/inorder_dyn_inst.hh"
+#include "cpu/inorder/pipeline_traits.hh"
+#include "cpu/inorder/resource.hh"
 
 class BranchPredictor : public Resource {
   public: