[commit: ghc] master: Vectoriser: merge fix (8a69084)

[Manuel Chakravarty]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8a690840c01152c8bf59cea1761d6e2eb26d9ff9

>---------------------------------------------------------------

commit 8a690840c01152c8bf59cea1761d6e2eb26d9ff9
Author: Manuel M T Chakravarty <chak at cse.unsw.edu.au>
Date:   Wed Feb 6 11:00:39 2013 +1100

    Vectoriser: merge fix

>---------------------------------------------------------------

 compiler/vectorise/Vectorise/Monad.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/compiler/vectorise/Vectorise/Monad.hs b/compiler/vectorise/Vectorise/Monad.hs
index e9078ab..04a0bf2 100644
--- a/compiler/vectorise/Vectorise/Monad.hs
+++ b/compiler/vectorise/Vectorise/Monad.hs
@@ -92,7 +92,7 @@ initV hsc_env guts info thing_inside
            ; let genv = extendImportedVarsEnv builtin_vars
                         . setPAFunsEnv        builtin_pas
                         . setPRFunsEnv        builtin_prs
-                        $ initGlobalEnv (dopt Opt_VectorisationAvoidance dflags) 
+                        $ initGlobalEnv (gopt Opt_VectorisationAvoidance dflags) 
                                         info (mg_vect_decls guts) instEnvs famInstEnvs
  
                -- perform vectorisation