From cdf41c1a3b39d3ed3297d1edf5ce68764e4f5f4d Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Tue, 29 Mar 2016 13:10:51 -0500
Subject: [PATCH] m68k/mcf5225x: Remove include of <rtems/console.h> from
 <bsp.h> and fix warnings

---
 c/src/lib/libbsp/m68k/mcf5225x/console/console.c | 11 ++++++-----
 c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h     |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/c/src/lib/libbsp/m68k/mcf5225x/console/console.c b/c/src/lib/libbsp/m68k/mcf5225x/console/console.c
index e7ecb3cdf6..34e9d9d438 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/console/console.c
+++ b/c/src/lib/libbsp/m68k/mcf5225x/console/console.c
@@ -10,14 +10,15 @@
 
 #include <stdio.h>
 #include <fcntl.h>
+#include <termios.h>
+#include <malloc.h>
+
 #include <rtems/libio.h>
 #include <rtems/termiostypes.h>
-#include <termios.h>
-#include <bsp.h>
-#include <malloc.h>
-#include <rtems/mw_uid.h>
-
+#include <rtems/console.h>
 #include <rtems/bspIo.h>
+#include <rtems/mw_uid.h>
+#include <bsp.h>
 
 #define UART_INTC0_IRQ_VECTOR(x) (64+13+(x))
 
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
index c0ec0515d2..b5689a768c 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5225x/include/bsp.h
@@ -11,7 +11,6 @@
 #include <bsp/default-initial-extension.h>
 #include <rtems.h>
 #include <rtems/iosupp.h>
-#include <rtems/console.h>
 #include <rtems/iosupp.h>
 #include <rtems/bspIo.h>