diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-13 09:14:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-13 09:14:40 +0200 |
| commit | c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf (patch) | |
| tree | 2254ceb7c66ba63b6cb6738af92c839f3868c748 /nuttx/configs/fire-stm32v2/src | |
| parent | bc5c15a4909386a1efd556f4648385440379b164 (diff) | |
| download | px4-nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.tar.gz px4-nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.tar.bz2 px4-nuttx-c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf.zip | |
Merged in upstream, took upstream UART driver without changes, needs re-evaluation (minor diffs to local version)
Diffstat (limited to 'nuttx/configs/fire-stm32v2/src')
| -rw-r--r-- | nuttx/configs/fire-stm32v2/src/up_usbmsc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/configs/fire-stm32v2/src/up_usbmsc.c b/nuttx/configs/fire-stm32v2/src/up_usbmsc.c index 98c06336f..3a1ebe0e0 100644 --- a/nuttx/configs/fire-stm32v2/src/up_usbmsc.c +++ b/nuttx/configs/fire-stm32v2/src/up_usbmsc.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/fire-stm32v2/src/up_usbmsc.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Configure and register the STM32 SPI-based MMC/SD block driver. @@ -95,7 +95,7 @@ int usbmsc_archinitialize(void) * this case, there is nothing further to be done here. */ -#ifndef CONFIG_EXAMPLES_USBMSC_BUILTIN +#ifndef CONFIG_NSH_BUILTIN_APPS return stm32_sdinitialize(CONFIG_EXAMPLES_USBMSC_DEVMINOR1); #else return OK; |