diff options
| author | daniel <danieruru@gmail.com> | 2013-01-11 00:18:14 +0900 |
|---|---|---|
| committer | daniel <danieruru@gmail.com> | 2013-01-11 00:18:14 +0900 |
| commit | 2d39eb19f4f9a3eeb738bc755f2e17fc7520450a (patch) | |
| tree | 07ec137cb38a6ba080f2a16ec268b69e9630e6e3 /instr-daemon.c | |
| parent | 2e613ee1aedd07023c6c9d17795a67c68cc6ae8a (diff) | |
| parent | 3870833ae365162eccd5e1416682de02c498467b (diff) | |
Merge branch 'master' into vxi
Conflicts:
instr-daemon.c
Diffstat (limited to 'instr-daemon.c')
| -rw-r--r-- | instr-daemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/instr-daemon.c b/instr-daemon.c index b0e05cd..e1d5c8e 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -15,6 +15,7 @@ #include <stdlib.h> #include <ctype.h> #include <glib.h> +#include <unistd.h> #include <fcntl.h> #define STDIN_BUF_SIZE 1024 @@ -352,7 +353,6 @@ static gboolean finish_boot (void) return FALSE; // no more calls to this function are needed } - static gboolean periodic_poll (void) { if (globals.HWDetect.beaglebone && bus_getpin (POWER_FAIL)) { |