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

[Joel Sherrill]

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

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

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

---

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

diff --git a/c/src/lib/libbsp/sparc/leon2/console/console.c b/c/src/lib/libbsp/sparc/leon2/console/console.c
index d4cb1bc..611dbfa 100644
--- a/c/src/lib/libbsp/sparc/leon2/console/console.c
+++ b/c/src/lib/libbsp/sparc/leon2/console/console.c
@@ -15,11 +15,13 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <bsp.h>
-#include <rtems/libio.h>
 #include <stdlib.h>
 #include <assert.h>
+
+#include <rtems/console.h>
+#include <rtems/libio.h>
 #include <rtems/bspIo.h>
+#include <bsp.h>
 
 /*
  *  console_outbyte_polled
diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
index c97049f..77d7d78 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
@@ -33,7 +33,6 @@
 
 #include <rtems.h>
 #include <leon.h>
-#include <rtems/console.h>
 #include <rtems/irq-extension.h>
 
 #ifdef __cplusplus