From 9e1883a2da28dc1fcc20783fbb318b9e64059a2e Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 27 Dec 2012 10:04:51 +0000
Subject: [PATCH] * target.def (supports_function_versions): Fix typo.

From-SVN: r194731
---
 gcc/ChangeLog  | 7 ++++---
 gcc/target.def | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 148388d4aa9..575e03a54f4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,7 @@
-<<<<<<< .mine
+2012-12-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* target.def (supports_function_versions): Fix typo.
+
 2012-12-26  Sriraman Tallam  <tmsriram@google.com>
 
 	* doc/tm.texi.in (TARGET_OPTION_SUPPORTS_FUNCTION_VERSIONS): Document
@@ -15,12 +18,10 @@
 	* (is_function_default_version): Check target string.
 	* TARGET_OPTION_SUPPORTS_FUNCTION_VERSIONS: New macro.
 
-=======
 2012-12-27  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* cgraph.c (verify_cgraph_node): Don't allocate/free visited_nodes set.
 
->>>>>>> .r194729
 2012-12-25  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	PR target/53789
diff --git a/gcc/target.def b/gcc/target.def
index 79bb955a05e..d0547be63c4 100644
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -2839,7 +2839,7 @@ DEFHOOK
 (supports_function_versions,
  "",
  bool, (void),
- hool_bool_void_false)
+ hook_bool_void_false)
 
 /* Function to determine if one function can inline another function.  */
 #undef HOOK_PREFIX