projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
os.h
diff --git
a/include/os.h
b/include/os.h
index
b65fba4
..
d6d6e57
100644
(file)
--- a/
include/os.h
+++ b/
include/os.h
@@
-113,7
+113,7
@@
void *os_malloc(size_t length);
*
* \param ptr Pointer to memory block to free
*/
-void
*
os_free(void *ptr);
+void os_free(void *ptr);
/**
* Reallocate previously-allocated memory to increase/decrease space