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

diff --cc arch/alpha/system.cc
index 1e80c7768086ea214d0bb864c2b1076e8b36e3c5,460131d43114d1291783949edc93d5a1cf248ebe..25543da57589d9d84101868576482e09762d2b89
--- 1/arch/alpha/system.cc
--- 2/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)