* ld-m68k/merge-error-1a.d: Mismatch is an error.

[deliverable/binutils-gdb.git] / ld / ldemul.c

diff --git a/ld/ldemul.c b/ld/ldemul.c
index fad1f184d596dcc8794457386bf8bf6b372df6b8..d4ed3d101695d23cadd45dfa11e21a1840684f00 100644 (file)
--- a/ld/ldemul.c
+++ b/ld/ldemul.c
@@ -1,6 +1,6 @@
 /* ldemul.c -- clearing house for ld emulation states
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2005
+   2001, 2002, 2003, 2005, 2007
    Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
@@ -20,9 +20,8 @@ along with GLD; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-#include "config.h"
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "getopt.h"
 #include "bfdlink.h"