summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2016-03-29 13:10:52 -0500
committerJoel Sherrill <joel@rtems.org>2016-03-29 13:10:52 -0500
commit629555cff4a14ada60f219022471e4580069f8cc (patch)
treed2b91c4ac22f87aba698ad50ff5e40076bcab7e2
parenta2abd260b09794c340dcd66b7c977a6e53154d84 (diff)
downloadrtems-629555cff4a14ada60f219022471e4580069f8cc.tar.bz2
powerpc/mpc8260ads: Remove include of <rtems/console.h> from <bsp.h> and fix warnings
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c6
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h1
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 9a020c82fe..f0ce259b4a 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 3ae89e2871..c207a2ec99 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>