[commit: ghc] wip/T5462: Remove wrongly introduced duplication (1f848a9)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T5462
Link       : http://ghc.haskell.org/trac/ghc/changeset/1f848a919f9476fbe2b70c4d40b93b872067674b/ghc

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

commit 1f848a919f9476fbe2b70c4d40b93b872067674b
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Fri Nov 14 16:55:59 2014 +0000

    Remove wrongly introduced duplication


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

1f848a919f9476fbe2b70c4d40b93b872067674b
 compiler/main/DynFlags.hs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 9d2df7a..354a64d 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2871,6 +2871,7 @@ xFlags = [
              $ deprecate $ "It was widely considered a misfeature, " ++
                            "and has been removed from the Haskell language." ),
   ( "DefaultSignatures",                Opt_DefaultSignatures, nop ),
+  ( "DeriveAnyClass",                   Opt_DeriveAnyClass, nop ),
   ( "DeriveDataTypeable",               Opt_DeriveDataTypeable, nop ),
   ( "DeriveFoldable",                   Opt_DeriveFoldable, nop ),
   ( "DeriveFunctor",                    Opt_DeriveFunctor, nop ),
@@ -2949,14 +2950,6 @@ xFlags = [
   ( "RoleAnnotations",                  Opt_RoleAnnotations, nop ),
   ( "ScopedTypeVariables",              Opt_ScopedTypeVariables, nop ),
   ( "StandaloneDeriving",               Opt_StandaloneDeriving, nop ),
-  ( "DeriveDataTypeable",               Opt_DeriveDataTypeable, nop ),
-  ( "AutoDeriveTypeable",               Opt_AutoDeriveTypeable, nop ),
-  ( "DeriveFunctor",                    Opt_DeriveFunctor, nop ),
-  ( "DeriveTraversable",                Opt_DeriveTraversable, nop ),
-  ( "DeriveFoldable",                   Opt_DeriveFoldable, nop ),
-  ( "DeriveAnyClass",                   Opt_DeriveAnyClass, nop ),
-  ( "DeriveGeneric",                    Opt_DeriveGeneric, nop ),
-  ( "DefaultSignatures",                Opt_DefaultSignatures, nop ),
   ( "TemplateHaskell",                  Opt_TemplateHaskell,
                      checkTemplateHaskellOk ),
   ( "TraditionalRecordSyntax",          Opt_TraditionalRecordSyntax, nop ),