summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-06 11:45:35 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-06 11:45:35 -0600
commitc8230fc4be87d7fdd360434c229371d8e2c80ead (patch)
tree26d9e14084fd4b2f2a1d7195377a3b28c6d977ee
parent39622e91aee672e907020057965a5145661c2fa8 (diff)
downloadnuttx-c8230fc4be87d7fdd360434c229371d8e2c80ead.tar.gz
nuttx-c8230fc4be87d7fdd360434c229371d8e2c80ead.tar.bz2
nuttx-c8230fc4be87d7fdd360434c229371d8e2c80ead.zip
fs_initialize() is no longer weak
-rw-r--r--nuttx/include/nuttx/fs/fs.h2
-rw-r--r--nuttx/sched/init/os_start.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/nuttx/include/nuttx/fs/fs.h b/nuttx/include/nuttx/fs/fs.h
index 077b9800b..a0c065ba1 100644
--- a/nuttx/include/nuttx/fs/fs.h
+++ b/nuttx/include/nuttx/fs/fs.h
@@ -365,7 +365,7 @@ extern "C"
*
****************************************************************************/
-void weak_function fs_initialize(void);
+void fs_initialize(void);
/* fs_foreachmountpoint.c ***************************************************/
/****************************************************************************
diff --git a/nuttx/sched/init/os_start.c b/nuttx/sched/init/os_start.c
index dae073b22..59929e0b5 100644
--- a/nuttx/sched/init/os_start.c
+++ b/nuttx/sched/init/os_start.c
@@ -459,12 +459,7 @@ void os_start(void)
#if CONFIG_NFILE_DESCRIPTORS > 0
/* Initialize the file system (needed to support device drivers) */
-#ifdef CONFIG_HAVE_WEAKFUNCTIONS
- if (fs_initialize != NULL)
-#endif
- {
- fs_initialize();
- }
+ fs_initialize();
#endif
#ifdef CONFIG_NET