diff --git a/ChangeLog b/ChangeLog
index 508761b6c5..7cf338fcc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7256,3 +7256,9 @@
 	  CONFIG_ARCH_IRQPRIO is not defined (2014-4-25).
 
 7.3 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* arch/arm/src/sama5/sam_clockconfig.c:  Needed function sam_pmcwait()
+	  is needed when UDPHS, EHCI, or OHCI is configured but may not be
+	  compiled in due to insufficient conditional logic.  From Luciano Neri
+	  (SourceForge patch #40).
+
diff --git a/arch/arm/src/sama5/sam_clockconfig.c b/arch/arm/src/sama5/sam_clockconfig.c
index 099d5da92d..739c3d527f 100644
--- a/arch/arm/src/sama5/sam_clockconfig.c
+++ b/arch/arm/src/sama5/sam_clockconfig.c
@@ -65,6 +65,16 @@
 #  define NEED_PLLSETUP 1
 #endif
 
+/* Do we need to configure the UPLL */
+
+#if !defined(CONFIG_SAMA5_EHCI) && !defined(CONFIG_SAMA5_OHCI) && \
+    !defined(CONFIG_SAMA5_UDPHS)
+
+   /* No... ignore the board setup */
+
+#  undef BOARD_USE_UPLL
+#endif
+
 /* Problems have been seen when reconfiguring the PLL while executing out
  * of NOR FLASH on CS0.  In that case, we required RAM function support.  The
  * critical functions will be copied from NOR into ISRAM for execution.  This
@@ -103,7 +113,7 @@
  *
  ****************************************************************************/
 
-#if defined(NEED_PLLSETUP)
+#if defined(NEED_PLLSETUP) || defined(BOARD_USE_UPLL)
 static void __ramfunc__ sam_pmcwait(uint32_t bit)
 {
   /* There is no timeout on this wait.  Why not?  Because the symptoms there