From 076a9ffaddb9e9616edbfa0eae13be91ffbf1171 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 7 Oct 2014 15:44:54 -0600
Subject: [PATCH] Simplification of conditional compilation suggested by
 pn_bouteville

---
 arch/arm/src/common/up_internal.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index 752d5c4a1f..b023171288 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -427,12 +427,16 @@ void up_lowputc(char ch);
 void up_puts(const char *str);
 void up_lowputs(const char *str);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
-void up_earlyserialinit(void);
+#if USE_SERIALDRIVER
 void up_serialinit(void);
 #else
-# define up_earlyserialinit()
-# define up_serialinit()
+#  define up_serialinit()
+#endif
+
+#if USE_EARLYSERIALINIT
+void up_earlyserialinit(void);
+#else
+#  define up_earlyserialinit()
 #endif
 
 /* Defined in drivers/lowconsole.c */