4 files changed, 15 insertions, 22 deletions
diff --git a/nuttx/arch/arm/include/irq.h b/nuttx/arch/arm/include/irq.h
index 2ee412334..da8c09d36 100644
--- a/nuttx/arch/arm/include/irq.h
+++ b/nuttx/arch/arm/include/irq.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/include/irq.h
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@
 
 #include <arch/chip/irq.h>
 
-/* Include ARM architectgure-specific IRQ definitions (including register
+/* Include ARM architecture-specific IRQ definitions (including register
  * save structure and irqsave()/irqrestore() macros
  */
 
diff --git a/nuttx/arch/arm/include/serial.h b/nuttx/arch/arm/include/serial.h
index 636e90947..d539d2733 100644
--- a/nuttx/arch/arm/include/serial.h
+++ b/nuttx/arch/arm/include/serial.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/include/serial.h
  *
- *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,17 +41,12 @@
  ****************************************************************************/
 
 #include <sys/types.h>
+#include <nuttx/ioctl.h>
 
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
-/* IOCTL commands supported by the ARM serial driver */
-
-#define TIOCSBRK        0x5401  /* BSD compatibility */
-#define TIOCCBRK        0x5402  /* " " "           " */
-#define TIOCSERGSTRUCT  0x5403  /* Get up_dev_t for port */
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
diff --git a/nuttx/arch/arm/include/watchdog.h b/nuttx/arch/arm/include/watchdog.h
index 6752ea62b..263795eb3 100644
--- a/nuttx/arch/arm/include/watchdog.h
+++ b/nuttx/arch/arm/include/watchdog.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/include/watchdog.h
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,14 +40,12 @@
  * Included Files
  ****************************************************************************/
 
+#include <nuttx/ioctl.h>
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
-/* IOCTL commands supported by the C5471 watchdog driver */
-
-#define WDIOC_KEEPALIVE 0x5701  /* Restart the watchdog timer */
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
diff --git a/nuttx/arch/arm/src/common/up_createstack.c b/nuttx/arch/arm/src/common/up_createstack.c
index f56d36390..0c9f0809f 100644
--- a/nuttx/arch/arm/src/common/up_createstack.c
+++ b/nuttx/arch/arm/src/common/up_createstack.c
@@ -109,18 +109,18 @@ int up_create_stack(_TCB *tcb, size_t stack_size)
        size_t size_of_stack;
 
        /* The ARM uses a push-down stack:  the stack grows
-	* toward loweraddresses in memory.  The stack pointer
-	* register, points to the lowest, valid work address
-	* (the "top" of the stack).  Items on the stack are
-	* referenced as positive word offsets from sp.
-	*/
+        * toward loweraddresses in memory.  The stack pointer
+        * register, points to the lowest, valid work address
+        * (the "top" of the stack).  Items on the stack are
+        * referenced as positive word offsets from sp.
+        */
 
        top_of_stack = (uint32_t)tcb->stack_alloc_ptr + stack_size - 4;
 
        /* The ARM stack must be aligned at word (4 byte)
-	* boundaries. If necessary top_of_stack must be rounded
-	* down to the next boundary
-	*/
+        * boundaries. If necessary top_of_stack must be rounded
+        * down to the next boundary
+        */
 
        top_of_stack &= ~3;
        size_of_stack = top_of_stack - (uint32_t)tcb->stack_alloc_ptr + 4;