[rtems commit] m68k/mcf5329: Remove include of <rtems/console.h> from < bsp.h> and fix warnings

[Joel Sherrill]

Module:    rtems
Branch:    master
Commit:    121971d91d577a88f05e43f175a8f56ad6e42f54
Changeset: http://git.rtems.org/rtems/commit/?id=121971d91d577a88f05e43f175a8f56ad6e42f54

Author:    Joel Sherrill <joel at rtems.org>
Date:      Tue Mar 29 13:10:51 2016 -0500

m68k/mcf5329: Remove include of <rtems/console.h> from <bsp.h> and fix warnings

---

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

diff --git a/c/src/lib/libbsp/m68k/mcf5329/console/console.c b/c/src/lib/libbsp/m68k/mcf5329/console/console.c
index 4b57131..5f5bef5 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/console/console.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/console/console.c
@@ -6,15 +6,17 @@
 
 #include <stdio.h>
 #include <fcntl.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/libio.h>
+#include <rtems/termiostypes.h>
+#include <rtems/console.h>
+#include <rtems/mw_uid.h>
 #include <rtems/bspIo.h>
 
+#include <bsp.h>
+
 #define UART_INTC0_IRQ_VECTOR(x) (64+26+(x))
 
 #define MCF_UART_USR_ERROR ( MCF_UART_USR_RB | \
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
index c4d80ae..f191a35 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
@@ -9,7 +9,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>