diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-12-28 17:09:35 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-12-28 17:09:35 -0600 |
| commit | 1fa80a9c16e5fffb613bf54941b9776e04c81c55 (patch) | |
| tree | 9070c7485ec1cc99b5de998f2270a8f348adc03b /apps | |
| parent | ff3a2ec3fa5cd8437fe7b718c275495c2a61852f (diff) | |
| download | nuttx-1fa80a9c16e5fffb613bf54941b9776e04c81c55.tar.gz nuttx-1fa80a9c16e5fffb613bf54941b9776e04c81c55.tar.bz2 nuttx-1fa80a9c16e5fffb613bf54941b9776e04c81c55.zip | |
apps/system/usbmsc: Fix some corrupted conditional compilation that crept in. Looks like some automatated update gone awry.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/system/usbmsc/usbmsc_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/system/usbmsc/usbmsc_main.c b/apps/system/usbmsc/usbmsc_main.c index 76fa81138..298a6e3ce 100644 --- a/apps/system/usbmsc/usbmsc_main.c +++ b/apps/system/usbmsc/usbmsc_main.c @@ -587,15 +587,15 @@ int msconn_main(int argc, char *argv[]) * device. This program is only available if CONFIG_NSH_BUILTIN_APPS * is defined in the NuttX configuration. In that case, this program can * be executed by entering the "msdis" command at the NSH console. -#ifdef CONFIG_BUILD_KERNEL * -int main(int argc, FAR char **argv) ****************************************************************************/ -#else #ifdef CONFIG_NSH_BUILTIN_APPS -#endif +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char **argv) +#else int msdis_main(int argc, char *argv[]) +#endif { /* First check if the USB mass storage device is already connected */ |