summaryrefslogtreecommitdiff
path: root/include/os.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-11-25 10:42:53 -0500
committerTom Rini <trini@ti.com>2013-11-25 10:42:53 -0500
commit74279d37613cb3081ee1680d67b2aed1f934472a (patch)
tree6528e6a0a08a53856c7d31a7eed28dc4d2ec0d21 /include/os.h
parent1a1326d2da9b2904bc90fb2990f829cb1ecef312 (diff)
parented072b96efd7a5de51cef01c3d4bed4db0e391f0 (diff)
downloadu-boot-imx-74279d37613cb3081ee1680d67b2aed1f934472a.zip
u-boot-imx-74279d37613cb3081ee1680d67b2aed1f934472a.tar.gz
u-boot-imx-74279d37613cb3081ee1680d67b2aed1f934472a.tar.bz2
Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86
Diffstat (limited to 'include/os.h')
-rw-r--r--include/os.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/os.h b/include/os.h
index 8665f70..950433d 100644
--- a/include/os.h
+++ b/include/os.h
@@ -11,6 +11,8 @@
#ifndef __OS_H__
#define __OS_H__
+#include <linux/types.h>
+
struct sandbox_state;
/**
@@ -116,7 +118,7 @@ void os_usleep(unsigned long usec);
*
* \return A monotonic increasing time scaled in nano seconds
*/
-u64 os_get_nsec(void);
+uint64_t os_get_nsec(void);
/**
* Parse arguments and update sandbox state.