From c92cef8ebdfddf491ca70998a56cacd997d5ed7b Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 28 Dec 2009 23:35:21 +0000
Subject: [PATCH] Fixes for recent header file reorganization

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2450 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/arm/src/lpc214x/lpc214x_decodeirq.c | 2 ++
 arch/arm/src/lpc214x/lpc214x_irq.c       | 2 ++
 arch/arm/src/lpc214x/lpc214x_lowputc.S   | 5 ++++-
 arch/arm/src/lpc214x/lpc214x_serial.c    | 1 +
 arch/arm/src/lpc214x/lpc214x_timerisr.c  | 3 ++-
 arch/arm/src/lpc214x/lpc214x_usbdev.c    | 2 ++
 arch/arm/src/str71x/str71x_decodeirq.c   | 2 +-
 arch/arm/src/str71x/str71x_irq.c         | 2 +-
 arch/arm/src/str71x/str71x_lowputc.c     | 6 +++---
 arch/arm/src/str71x/str71x_serial.c      | 1 +
 arch/arm/src/str71x/str71x_timerisr.c    | 4 ++--
 11 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/arch/arm/src/lpc214x/lpc214x_decodeirq.c b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
index 55b891bd3d..dc76509a9b 100644
--- a/arch/arm/src/lpc214x/lpc214x_decodeirq.c
+++ b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
@@ -45,9 +45,11 @@
 #include <assert.h>
 #include <debug.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
+
 #include "lpc214x_vic.h"
 
 /********************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_irq.c b/arch/arm/src/lpc214x/lpc214x_irq.c
index 3f5d267f2e..9d8ed817bc 100644
--- a/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -44,9 +44,11 @@
 #include <nuttx/irq.h>
 
 #include "arm.h"
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
+
 #include "lpc214x_vic.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_lowputc.S b/arch/arm/src/lpc214x/lpc214x_lowputc.S
index 190a33b378..e36b1d83f8 100644
--- a/arch/arm/src/lpc214x/lpc214x_lowputc.S
+++ b/arch/arm/src/lpc214x/lpc214x_lowputc.S
@@ -38,8 +38,11 @@
  **************************************************************************/
 
 #include <nuttx/config.h>
-#include "up_internal.h"
+
+#include "chip.h"
 #include "up_arch.h"
+#include "up_internal.h"
+
 #include "lpc214x_pinsel.h"
 #include "lpc214x_uart.h"
 
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index f18af4fe06..13a69716bc 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -52,6 +52,7 @@
 #include <nuttx/serial.h>
 #include <arch/serial.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_timerisr.c b/arch/arm/src/lpc214x/lpc214x_timerisr.c
index c75b5421e0..65e9adb57d 100644
--- a/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -44,9 +44,10 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
+#include "chip.h"
+#include "up_arch.h"
 #include "clock_internal.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
 #include "lpc214x_timer.h"
 #include "lpc214x_vic.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 0149465d53..639b7b9149 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -55,8 +55,10 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
+
 #include "lpc214x_usbdev.h"
 #include "lpc214x_pll.h"
 #include "lpc214x_power.h"
diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c
index 035ec5318d..1a816bcf74 100644
--- a/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/arch/arm/src/str71x/str71x_decodeirq.c
@@ -45,10 +45,10 @@
 #include <assert.h>
 #include <debug.h>
 
+#include "chip.h"
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
-#include "chip.h"
 
 /********************************************************************************
  * Pre-procesor Definitions
diff --git a/arch/arm/src/str71x/str71x_irq.c b/arch/arm/src/str71x/str71x_irq.c
index 2f9570d029..ed39a560be 100644
--- a/arch/arm/src/str71x/str71x_irq.c
+++ b/arch/arm/src/str71x/str71x_irq.c
@@ -45,9 +45,9 @@
 #include <nuttx/arch.h>
 
 #include "arm.h"
+#include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "chip.h"
 
 /****************************************************************************
  * Pre-procesor Definitions
diff --git a/arch/arm/src/str71x/str71x_lowputc.c b/arch/arm/src/str71x/str71x_lowputc.c
index bf81f5b663..a34b185c8f 100644
--- a/arch/arm/src/str71x/str71x_lowputc.c
+++ b/arch/arm/src/str71x/str71x_lowputc.c
@@ -40,10 +40,10 @@
 #include <nuttx/config.h>
 #include <stdint.h>
 
-#include "up_internal.h"
-#include "up_arch.h"
-
 #include "chip.h"
+#include "up_arch.h"
+#include "up_internal.h"
+
 #include "str71x_internal.h"
 
 /**************************************************************************
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index da4d280ebc..31389404c5 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -56,6 +56,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "os_internal.h"
+
 #include "str71x_internal.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/str71x/str71x_timerisr.c b/arch/arm/src/str71x/str71x_timerisr.c
index 238e0eb77e..8f41b92912 100644
--- a/arch/arm/src/str71x/str71x_timerisr.c
+++ b/arch/arm/src/str71x/str71x_timerisr.c
@@ -45,11 +45,11 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
+#include "chip.h"
+#include "up_arch.h"
 #include "clock_internal.h"
 #include "up_internal.h"
-#include "up_arch.h"
 
-#include "chip.h"
 #include "str71x_internal.h"
 
 /****************************************************************************