summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2016-03-29 13:10:51 -0500
committerJoel Sherrill <joel@rtems.org>2016-03-29 13:10:51 -0500
commiteefad3094b4e9e04508d2962a4be2ae146367048 (patch)
treec8bed2a46807ae2190b4a8ab80bef91e2572533b
parentm68k/csb360: Remove include of <rtems/console.h> from <bsp.h> and fix warnings (diff)
downloadrtems-eefad3094b4e9e04508d2962a4be2ae146367048.tar.bz2
m68k/gen68340: Remove include of <rtems/console.h> from <bsp.h> and fix warnings
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/console/console.c12
-rw-r--r--c/src/lib/libbsp/m68k/gen68340/include/bsp.h1
2 files changed, 7 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c
index 2cd7fb2c2d..dd38559fb1 100644
--- a/c/src/lib/libbsp/m68k/gen68340/console/console.c
+++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c
@@ -21,16 +21,18 @@
*/
#include <termios.h>
-#include <bsp.h>
-#include <rtems/libio.h>
-#include <m68340.h>
-#include <m340uart.h>
-#include <m340timer.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+
+#include <bsp.h>
+#include <rtems/libio.h>
#include <rtems/termiostypes.h>
+#include <rtems/console.h>
+#include <m68340.h>
+#include <m340uart.h>
+#include <m340timer.h>
#define CONSOLE_VECTOR 121
#define CONSOLE_IRQ_LEVEL 3
diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
index d01ca6c470..37a1d0749a 100644
--- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h
@@ -32,7 +32,6 @@
#include <bsp/default-initial-extension.h>
#include <rtems.h>
-#include <rtems/console.h>
#include <rtems/iosupp.h>
#ifdef __cplusplus