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
commit121971d91d577a88f05e43f175a8f56ad6e42f54 (patch)
treed39302eb1f7cb4a1a2850f447b67165ca8b8d9b5
parentm68k/mcf5235: Remove include of <rtems/console.h> from <bsp.h> and fix warnings (diff)
downloadrtems-121971d91d577a88f05e43f175a8f56ad6e42f54.tar.bz2
m68k/mcf5329: Remove include of <rtems/console.h> from <bsp.h> and fix warnings
-rw-r--r--c/src/lib/libbsp/m68k/mcf5329/console/console.c10
-rw-r--r--c/src/lib/libbsp/m68k/mcf5329/include/bsp.h1
2 files changed, 6 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5329/console/console.c b/c/src/lib/libbsp/m68k/mcf5329/console/console.c
index 4b571318c8..5f5bef58aa 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/console/console.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/console/console.c
@@ -6,15 +6,17 @@
#include <stdio.h>
#include <fcntl.h>
-#include <rtems/libio.h>
-#include <rtems/termiostypes.h>
#include <termios.h>
-#include <bsp.h>
#include <malloc.h>
-#include <rtems/mw_uid.h>
+#include <rtems/libio.h>
+#include <rtems/termiostypes.h>
+#include <rtems/console.h>
+#include <rtems/mw_uid.h>
#include <rtems/bspIo.h>
+#include <bsp.h>
+
#define UART_INTC0_IRQ_VECTOR(x) (64+26+(x))
#define MCF_UART_USR_ERROR ( MCF_UART_USR_RB | \
diff --git a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
index c4d80aef63..f191a35187 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5329/include/bsp.h
@@ -9,7 +9,6 @@
#include <bsp/default-initial-extension.h>
#include <rtems.h>
#include <rtems/iosupp.h>
-#include <rtems/console.h>
#include <rtems/iosupp.h>
#include <rtems/bspIo.h>