[commit: base] master: Follow ghc-prim changes (9c12be2)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9c12be2079797ce4b8791ec9036b4790e4e22c82

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

commit 9c12be2079797ce4b8791ec9036b4790e4e22c82
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri Aug 26 21:37:47 2011 +0100

    Follow ghc-prim changes

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

 Data/Tuple.hs |    6 +-----
 GHC/Base.lhs  |   10 ++++------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Data/Tuple.hs b/Data/Tuple.hs
index 5b5d32f..0029fb9 100644
--- a/Data/Tuple.hs
+++ b/Data/Tuple.hs
@@ -45,7 +45,7 @@ module Data.Tuple
 
 import GHC.Base
 -- We need to depend on GHC.Base so that
--- a) so that we get GHC.Classes, GHC.Ordering, GHC.Types
+-- a) so that we get GHC.Classes, GHC.Types
 
 -- b) so that GHC.Base.inline is available, which is used
 --    when expanding instance declarations
@@ -80,10 +80,6 @@ import Prelude
   )
 #endif
 
-#ifdef __GLASGOW_HASKELL__
-import GHC.Unit ()
-#endif
-
 default ()              -- Double isn't available yet
 
 -- ---------------------------------------------------------------------------
diff --git a/GHC/Base.lhs b/GHC/Base.lhs
index 6c1f58b..48a4d46 100644
--- a/GHC/Base.lhs
+++ b/GHC/Base.lhs
@@ -98,7 +98,6 @@ module GHC.Base
         module GHC.Base,
         module GHC.Classes,
         module GHC.CString,
-        module GHC.Ordering,
         module GHC.Types,
         module GHC.Prim,        -- Re-export GHC.Prim and GHC.Err, to avoid lots
         module GHC.Err          -- of people having to import it explicitly
@@ -108,17 +107,16 @@ module GHC.Base
 import GHC.Types
 import GHC.Classes
 import GHC.CString
-import GHC.Ordering
 import GHC.Prim
 import {-# SOURCE #-} GHC.Show
 import {-# SOURCE #-} GHC.Err
 import {-# SOURCE #-} GHC.IO (failIO)
 
--- These two are not strictly speaking required by this module, but they are
--- implicit dependencies whenever () or tuples are mentioned, so adding them
--- as imports here helps to get the dependencies right in the new build system.
+-- This is not strictly speaking required by this module, but is an
+-- implicit dependency whenever () or tuples are mentioned, so adding it
+-- as an import here helps to get the dependencies right in the new
+-- build system.
 import GHC.Tuple ()
-import GHC.Unit ()
 -- Likewise we need Integer when deriving things like Eq instances, and
 -- this is a convenient place to force it to be built
 import GHC.Integer ()