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

[Joel Sherrill]

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

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

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

---

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

diff --git a/c/src/lib/libbsp/m68k/genmcf548x/console/console.c b/c/src/lib/libbsp/m68k/genmcf548x/console/console.c
index e85b934..dee561f 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/console/console.c
+++ b/c/src/lib/libbsp/m68k/genmcf548x/console/console.c
@@ -52,14 +52,15 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <rtems/libio.h>
-#include <rtems/termiostypes.h>
 #include <termios.h>
-#include <bsp.h>
-#include <bsp/irq-generic.h>
 #include <malloc.h>
 #include <rtems/mw_uid.h>
 
+#include <bsp.h>
+#include <bsp/irq-generic.h>
+#include <rtems/libio.h>
+#include <rtems/termiostypes.h>
+#include <rtems/console.h>
 #include <rtems/bspIo.h>
 
 #define UART_INTC0_IRQ_VECTOR(x) (64+35-(x))
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
index edee8d4..6c44d9d 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
@@ -67,7 +67,6 @@
 
 #include <rtems.h>
 #include <rtems/iosupp.h>
-#include <rtems/console.h>
 #include <rtems/iosupp.h>
 #include <rtems/bspIo.h>