From 2d5313a9314715c86570dda563e249574db3a283 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 23 Aug 2013 16:40:30 -0600 Subject: [PATCH] Fix #endif with missing #if condition. Reported by Andrew Bradford --- ChangeLog | 2 ++ arch/arm/src/lpc17xx/lpc17_usbhost.h | 2 ++ arch/arm/src/stm32/stm32_usbhost.h | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2e1dd12e0bc..ae0124d4eab 100644 --- a/ChangeLog +++ b/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/arch/arm/src/lpc17xx/lpc17_usbhost.h b/arch/arm/src/lpc17xx/lpc17_usbhost.h index 715d6976ffb..f2728037280 100644 --- a/arch/arm/src/lpc17xx/lpc17_usbhost.h +++ b/arch/arm/src/lpc17xx/lpc17_usbhost.h @@ -50,6 +50,8 @@ * Public Types ************************************************************************************/ +#ifndef __ASSEMBLY__ + /************************************************************************************ * Public Data ************************************************************************************/ diff --git a/arch/arm/src/stm32/stm32_usbhost.h b/arch/arm/src/stm32/stm32_usbhost.h index d9bce33f771..f082b6f17fc 100644 --- a/arch/arm/src/stm32/stm32_usbhost.h +++ b/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)