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

[Joel Sherrill]

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

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

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

---

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

diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
index 9a020c8..f0ce259 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
@@ -88,10 +88,12 @@
  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <bsp.h>                /* Must be before libio.h */
+#include <termios.h>
+
+#include <rtems/console.h>
 #include <rtems/bspIo.h>
 #include <rtems/libio.h>
-#include <termios.h>
+#include <bsp.h>
 
 static void _BSP_output_char( char c );
 static rtems_status_code do_poll_read( rtems_device_major_number major, rtems_device_minor_number minor, void * arg);
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
index 3ae89e2..c207a2e 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h
@@ -18,7 +18,6 @@
 #include <bsp/default-initial-extension.h>
 
 #include <rtems.h>
-#include <rtems/console.h>
 #include <mpc8260.h>
 #include <mpc8260/cpm.h>
 #include <mpc8260/mmu.h>