[PATCH 5/8] gumstix/include/bsp.h: Do not include libchip/serial to avoid conflicts when building libchip/rtc

[Joel Sherrill]

---
 c/src/lib/libbsp/arm/gumstix/include/bsp.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/c/src/lib/libbsp/arm/gumstix/include/bsp.h
index 15ef4b5..fec1ebb 100644
--- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h
+++ b/c/src/lib/libbsp/arm/gumstix/include/bsp.h
@@ -25,7 +25,6 @@ extern "C" {
 #include <rtems.h>
 #include <rtems/console.h>
 #include <rtems/clockdrv.h>
-#include <libchip/serial.h>
 
 /**
  * @defgroup arm_gumstix Gumstix Support
@@ -45,7 +44,13 @@ extern "C" {
 /** @brief What is the last interrupt */
 #define BSP_MAX_INT AT91RM9200_MAX_INT
 
+/*
+ * forward reference the type to avoid conflicts between libchip serial
+ * and libchip rtc get and set register types.
+ */
+typedef struct _console_tbl console_tbl;
 console_tbl *BSP_get_uart_from_minor(int minor);
+
 static inline int32_t BSP_get_baud(void) {return 115200;}
 
 /** @brief How big should the interrupt stack be? */
-- 
1.9.3