From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 5 Mar 2006 03:32:13 +0000 (-0500)
Subject: Merge gblack@m5.eecs.umich.edu:/bk/multiarch
X-Git-Tag: m5_2.0_beta1~87^2~23^2~1^2~6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc619f37aead3dfac240971c7769f064b44a3046;p=gem5.git

Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into  ewok.(none):/home/gblack/m5/multiarch

arch/alpha/system.cc:
    Hand merged

--HG--
extra : convert_revision : 34d7608d21dc6dee3a3feed5e5671f5de6ebfa26
---

bc619f37aead3dfac240971c7769f064b44a3046
diff --cc arch/alpha/system.cc
index 1e80c7768,460131d43..25543da57
--- a/arch/alpha/system.cc
+++ b/arch/alpha/system.cc
@@@ -36,7 -35,8 +36,8 @@@
  #include "mem/functional/physical.hh"
  #include "sim/byteswap.hh"
  #include "sim/builder.hh"
 -#include "arch/vtophys.hh"
 +
+ 
  using namespace LittleEndianGuest;
  
  AlphaSystem::AlphaSystem(Params *p)