summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h2
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_usbhost.h2
3 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 2e1dd12e0..ae0124d4e 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5431,4 +5431,6 @@
SourceForge bug #16 Fix IO pin map. Add CONFIG_SERIAL_TERMIOS support.
Also fixes some STM32 F4 Timer 8 pin configurations. From CCTSAO
(2013-8-23).
+ * arch/arm/src/lpc17xx/lpc17_usbhost.h: Fix #endif with missing #if
+ condition. Reported by Andrew Bradford (2013-8-23).
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h
index 715d6976f..f27280372 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h
@@ -50,6 +50,8 @@
* Public Types
************************************************************************************/
+#ifndef __ASSEMBLY__
+
/************************************************************************************
* Public Data
************************************************************************************/
diff --git a/nuttx/arch/arm/src/stm32/stm32_usbhost.h b/nuttx/arch/arm/src/stm32/stm32_usbhost.h
index d9bce33f7..f082b6f17 100644
--- a/nuttx/arch/arm/src/stm32/stm32_usbhost.h
+++ b/nuttx/arch/arm/src/stm32/stm32_usbhost.h
@@ -115,7 +115,7 @@ extern "C" {
*
***********************************************************************************/
-EXTERN void stm32_usbhost_vbusdrive(int iface, bool enable);
+void stm32_usbhost_vbusdrive(int iface, bool enable);
#undef EXTERN
#if defined(__cplusplus)