From f6e514db1f6a1581c05c4b9141172d7035076980 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 2 Apr 2016 14:51:36 -0600 Subject: [PATCH] Too many conditions on compilation --- configs/spark/src/stm32_usbmsc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configs/spark/src/stm32_usbmsc.c b/configs/spark/src/stm32_usbmsc.c index 71140e125e..23c4cc9533 100644 --- a/configs/spark/src/stm32_usbmsc.c +++ b/configs/spark/src/stm32_usbmsc.c @@ -45,8 +45,7 @@ #include "spark.h" -#if defined(CONFIG_USBMSC) && !defined(CONFIG_USBMSC_COMPOSITE) && \ - defined(CONFIG_BOARDCTL_USBDEVCTRL) +#if defined(CONFIG_USBMSC) && defined(CONFIG_BOARDCTL_USBDEVCTRL) /**************************************************************************** * Public Functions @@ -66,4 +65,4 @@ int board_usbmsc_initialize(int port) return board_app_initialize(); } -#endif /* CONFIG_USBMSC && !CONFIG_USBMSC_COMPOSITE && CONFIG_BOARDCTL_USBDEVCTRL */ +#endif /* CONFIG_USBMSC && CONFIG_BOARDCTL_USBDEVCTRL */