From deed28b8f2d8f21a6bf3bfd5e30732b8f4f3db46 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 19 Mar 2016 08:08:40 -0600 Subject: [PATCH] USB composite: Fix some errors in conditional compilation --- drivers/usbdev/composite.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usbdev/composite.h b/drivers/usbdev/composite.h index ae97b25fbf..f1adb4337c 100644 --- a/drivers/usbdev/composite.h +++ b/drivers/usbdev/composite.h @@ -140,7 +140,7 @@ # define DEV1_STRIDBASE CONFIG_CDCACM_STRBASE # define DEV1_NSTRIDS CDCACM_NSTRIDS # define DEV1_CFGDESCSIZE SIZEOF_CDCACM_CFGDESC -#elif defined(CONFIG_CDCACM_COMPOSITE) +#elif defined(CONFIG_USBMSC_COMPOSITE) # define DEV1_IS_USBMSC 1 # define DEV1_MKCFGDESC usbmsc_mkcfgdesc # define DEV1_MKSTRDESC usbmsc_mkstrdesc @@ -174,7 +174,7 @@ # define DEV2_STRIDBASE CONFIG_CDCACM_STRBASE # define DEV2_NSTRIDS CDCACM_NSTRIDS # define DEV2_CFGDESCSIZE SIZEOF_CDCACM_CFGDESC -#elif defined(CONFIG_CDCACM_COMPOSITE) && !defined(DEV1_IS_USBMSC) +#elif defined(CONFIG_USBMSC_COMPOSITE) && !defined(DEV1_IS_USBMSC) # define DEV2_IS_USBMSC 1 # define DEV2_MKCFGDESC usbmsc_mkcfgdesc # define DEV2_MKSTRDESC usbmsc_mkstrdesc