diff --git a/arch/README.txt b/arch/README.txt
index 85175c6a07..ff0fd4f004 100644
--- a/arch/README.txt
+++ b/arch/README.txt
@@ -149,17 +149,15 @@ include/types.h
 
 include/irq.h
   This file needs to define some architecture specific functions (usually
-  inline) and structure.  These include:
+  inline if the compiler supports inlining) and structure.  These include:
 
   - struct xcptcontext.  This structures represents the saved context
     of a thread.
 
-  - static inline uint32 irqsave(void) -- Used to disable
-    all interrupts.
+  - uint32 irqsave(void) -- Used to disable all interrupts.
 
-  - static inline void irqrestore(uint32 flags) -- Used to
-    restore interrupts enables to the same state as before irqsave
-    was called.
+  - void irqrestore(uint32 flags) -- Used to restore interrupt
+    enables to the same state as before irqsave was called.
 
   This file must also define NR_IRQS, the total number of IRQs supported
   by the board.
diff --git a/arch/c5471/src/up_serial.c b/arch/c5471/src/up_serial.c
index 25746da3f6..df4927660a 100644
--- a/arch/c5471/src/up_serial.c
+++ b/arch/c5471/src/up_serial.c
@@ -123,7 +123,6 @@ static int     up_close(struct file *filep);
 static ssize_t up_read(struct file *filep, char *buffer, size_t buflen);
 static ssize_t up_write(struct file *filep, const char *buffer, size_t buflen);
 static int     up_ioctl(struct file *filep, int cmd, unsigned long arg);
-static void    up_consoleinit(up_dev_t *dev);
 static void    up_uartsetup(up_dev_t *dev);
 static void    up_delay(int milliseconds);
 
@@ -590,7 +589,7 @@ static void up_xmitchars(up_dev_t *dev)
  * serial driver.
  */
 
-static int up_interrupt(int irq, struct xcptcontext *xcp)
+static int up_interrupt(int irq, void *context)
 {
   up_dev_t         *dev;
   volatile uint32 cause;