[commit: ghc] ghc-7.10: Re-export `<$` from Prelude (#10113) (8601c744)

[git at git.haskell.org]

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/8601c74450a2a079ab1a8b67f18b503fae5b057b/ghc

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

commit 8601c74450a2a079ab1a8b67f18b503fae5b057b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Mar 7 11:37:52 2015 +0100

    Re-export `<$` from Prelude (#10113)
    
    This is a follow-up to eb3661f2b9f8472f3714774126ebe1183484dd85
    re-exporting `<$` from `Prelude` as well.
    
    (cherry picked from commit 479523f3c37894d63352f1718e06696f3ed63143)


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

8601c74450a2a079ab1a8b67f18b503fae5b057b
 libraries/base/Prelude.hs                                | 2 +-
 testsuite/tests/indexed-types/should_compile/Simple15.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/base/Prelude.hs b/libraries/base/Prelude.hs
index 8e275aa..fa070f3 100644
--- a/libraries/base/Prelude.hs
+++ b/libraries/base/Prelude.hs
@@ -70,7 +70,7 @@ module Prelude (
     Monoid(mempty, mappend, mconcat),
 
     -- ** Monads and functors
-    Functor(fmap), (<$>),
+    Functor(fmap, (<$)), (<$>),
     Applicative(pure, (<*>), (*>), (<*)),
     Monad((>>=), (>>), return, fail),
     mapM_, sequence_, (=<<),
diff --git a/testsuite/tests/indexed-types/should_compile/Simple15.hs b/testsuite/tests/indexed-types/should_compile/Simple15.hs
index 8a28d27..31829d6 100644
--- a/testsuite/tests/indexed-types/should_compile/Simple15.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple15.hs
@@ -19,7 +19,7 @@ data FOO = FOO
 type instance Def FOO = EQU () ()
 
 foo :: FOO
-foo = equ_refl <$ def
+foo = equ_refl Simple15.<$ def
 -- This works:
 -- foo = def $ equ_refl