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

[Joel Sherrill]

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

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

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

---

 c/src/lib/libbsp/sh/gensh4/console/console.c | 6 ++++--
 c/src/lib/libbsp/sh/gensh4/include/bsp.h     | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/c/src/lib/libbsp/sh/gensh4/console/console.c b/c/src/lib/libbsp/sh/gensh4/console/console.c
index de4ee6c..917556d 100644
--- a/c/src/lib/libbsp/sh/gensh4/console/console.c
+++ b/c/src/lib/libbsp/sh/gensh4/console/console.c
@@ -12,10 +12,12 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <bsp.h>
-
 #include <termios.h>
+
+#include <rtems/console.h>
 #include <rtems/libio.h>
+#include <bsp.h>
+
 #include "sh/sh4uart.h"
 
 /* Descriptor structures for two on-chip UART channels */
diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
index 0934e2c..b70c2ff 100644
--- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h
@@ -41,7 +41,6 @@
 #define LIBBSP_SH_GENSH4_BSP_H
 
 #include <rtems.h>
-#include <rtems/console.h>
 #include <bspopts.h>
 #include <bsp/default-initial-extension.h>