diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 13:19:26 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-07-04 13:19:47 +0100 |
| commit | 3f0afabaf3e862d986279dc041b14b61e73f86d3 (patch) | |
| tree | 30b0a2dabcdbf01688040ea28128292970dc4085 /compiler/codeGen/CodeGen.lhs | |
| parent | 99fd2469fba1a38b2a65b4694f337d92e559df01 (diff) | |
| download | haskell-3f0afabaf3e862d986279dc041b14b61e73f86d3.tar.gz | |
Fix merge-related problems
Diffstat (limited to 'compiler/codeGen/CodeGen.lhs')
| -rw-r--r-- | compiler/codeGen/CodeGen.lhs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/codeGen/CodeGen.lhs b/compiler/codeGen/CodeGen.lhs index 9c936d3281..c9b2bf8ab0 100644 --- a/compiler/codeGen/CodeGen.lhs +++ b/compiler/codeGen/CodeGen.lhs @@ -30,7 +30,7 @@ import CgHpc import CLabel import OldCmm -import OldPprCmm +import OldPprCmm () import StgSyn import PrelNames @@ -46,6 +46,7 @@ import Module import ErrUtils import Panic import Outputable +import Util import OrdList import Stream (Stream, liftIO) |