From d802b86f097f2aad6d0cb32a8026055229de8dc7 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 16 May 2010 13:09:48 +0000
Subject: [PATCH] board.h should not include files in arch directory

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2680 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/arm/src/lm3s/lm3s_gpio.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/arm/src/lm3s/lm3s_gpio.c b/arch/arm/src/lm3s/lm3s_gpio.c
index 305103143a..cc1f77c356 100644
--- a/arch/arm/src/lm3s/lm3s_gpio.c
+++ b/arch/arm/src/lm3s/lm3s_gpio.c
@@ -140,18 +140,19 @@ static const struct gpio_func_s g_funcbits[] =
   {GPIO_INTERRUPT_SETBITS, GPIO_INTERRUPT_CLRBITS}, /* GPIO_FUNC_INTERRUPT */
 };
 
-#ifdef LM3S_GPIOH_BASE
-{
-  LM3S_GPIOA_BASE, LM3S_GPIOB_BASE, LM3S_GPIOC_BASE, LM3S_GPIOD_BASE,
-  LM3S_GPIOE_BASE, LM3S_GPIOF_BASE, LM3S_GPIOG_BASE, LM3S_GPIOH_BASE,
-};
-#else
 static const uint32_t g_gpiobase[] =
 {
   LM3S_GPIOA_BASE, LM3S_GPIOB_BASE, LM3S_GPIOC_BASE, LM3S_GPIOD_BASE,
-  LM3S_GPIOE_BASE, LM3S_GPIOF_BASE, LM3S_GPIOG_BASE, 0,
-};
+  LM3S_GPIOE_BASE, LM3S_GPIOF_BASE, LM3S_GPIOG_BASE,
+
+  /* GPIOH exists on the LM3S6918, but not on the LM3S6965 */
+
+#ifdef LM3S_GPIOH_BASE
+  LM3S_GPIOH_BASE,
+#else
+  0,
 #endif
+};
 
 /****************************************************************************
  * Public Data