Merge in new code generator branch.

[ghc-hetmet.git] / compiler / codeGen / StgCmmEnv.hs

diff --git a/compiler/codeGen/StgCmmEnv.hs b/compiler/codeGen/StgCmmEnv.hs
index a1ba606..469f58d 100644 (file)
--- a/compiler/codeGen/StgCmmEnv.hs
+++ b/compiler/codeGen/StgCmmEnv.hs
@@ -35,13 +35,12 @@ import StgCmmClosure
 import CLabel
 
 import BlockId
-import Cmm
+import CmmExpr
 import CmmUtils
 import FastString
-import PprCmm          ( {- instance Outputable -} )
 import Id
 import VarEnv
-import Monad
+import Control.Monad
 import Name
 import StgSyn
 import Outputable