From 2a8afe10a7018a592c87b90e2dc307ad532a0d5a Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Tue, 29 Mar 2016 13:10:52 -0500
Subject: powerpc/tqm8xx: Remove include of <rtems/console.h> from <bsp.h> and
 fix warnings

---
 c/src/lib/libbsp/powerpc/tqm8xx/console/console.c | 15 +++++++++------
 c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h     |  1 -
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
index 44018a4514..e0b4c70677 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
@@ -46,19 +46,22 @@
  *  http://www.OARcorp.com/rtems/license.html.
  */
 
-#include <rtems.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <bsp.h>
-#include <mpc8xx.h>
-#include <rtems/irq.h>
-#include <bsp/irq.h>
-#include <rtems/libio.h>
 #include <termios.h>
 #include <unistd.h>
+
+#include <rtems.h>
+#include <rtems/console.h>
+#include <rtems/libio.h>
 #include <rtems/termiostypes.h>
 #include <rtems/bspIo.h>
 #include <rtems/error.h>
+#include <rtems/irq.h>
+
+#include <bsp.h>
+#include <mpc8xx.h>
+#include <bsp/irq.h>
 
 /*
  * Interrupt-driven input buffer
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h b/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
index c1d6162348..5c8eae81b4 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/include/bsp.h
@@ -64,7 +64,6 @@ LINKER_SYMBOL( bsp_work_area_start);
 #include <bspopts.h>
 
 #include <rtems.h>
-#include <rtems/console.h>
 #include <rtems/irq.h>
 #include <mpc8xx.h>
 #include <mpc8xx/cpm.h>
-- 
cgit v1.2.3