summaryrefslogtreecommitdiff
path: root/nuttx/fs
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-21 11:16:55 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-21 11:16:55 -0600
commit4c36b97235c919e8001e08a6120fc86aae9dff3e (patch)
tree8bb5885dfea494406caec7f4738d7349e50ecce6 /nuttx/fs
parent53780a7956316b463230e20a80a6a9b1e3d05bf1 (diff)
downloadpx4-nuttx-4c36b97235c919e8001e08a6120fc86aae9dff3e.tar.gz
px4-nuttx-4c36b97235c919e8001e08a6120fc86aae9dff3e.tar.bz2
px4-nuttx-4c36b97235c919e8001e08a6120fc86aae9dff3e.zip
wdog.h does not contain any application interface, only internal OS interface. Further, it is non-standard. Move wdog.h from include/ to include/nuttx. For the same reason, move the description of the watchdog timer interfaces from the Users Guide to the Porting Guide.
Diffstat (limited to 'nuttx/fs')
-rw-r--r--nuttx/fs/fs_automount.c2
-rw-r--r--nuttx/fs/fs_poll.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/fs/fs_automount.c b/nuttx/fs/fs_automount.c
index 9074d4159..5e35f0b68 100644
--- a/nuttx/fs/fs_automount.c
+++ b/nuttx/fs/fs_automount.c
@@ -46,11 +46,11 @@
#include <sys/mount.h>
#include <stdbool.h>
-#include <wdog.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
+#include <nuttx/wdog.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
#include <nuttx/fs/automount.h>
diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c
index 5f4e1dd5f..b3ec6c63e 100644
--- a/nuttx/fs/fs_poll.c
+++ b/nuttx/fs/fs_poll.c
@@ -1,7 +1,7 @@
/****************************************************************************
* fs/fs_poll.c
*
- * Copyright (C) 2008-2009, 2012-2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009, 2012-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -42,14 +42,14 @@
#include <stdint.h>
#include <stdbool.h>
#include <poll.h>
-#include <wdog.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs/fs.h>
+#include <nuttx/wdog.h>
#include <nuttx/sched.h>
#include <nuttx/clock.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"