diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
| commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
| tree | 52f7223e7c63f43322f3eee4722743e12190a19f /common/dlmalloc.src | |
| parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
| parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
| download | olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.zip  | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	drivers/video/exynos_fb.c
Diffstat (limited to 'common/dlmalloc.src')
| -rw-r--r-- | common/dlmalloc.src | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/common/dlmalloc.src b/common/dlmalloc.src index 32a38bc70..d86acffde 100644 --- a/common/dlmalloc.src +++ b/common/dlmalloc.src @@ -198,7 +198,7 @@    MORECORE_FAILURE          (default: -1)       The value returned upon failure of MORECORE.    MORECORE_CLEARS           (default 1) -     True (1) if the routine mapped to MORECORE zeroes out memory (which +     true (1) if the routine mapped to MORECORE zeroes out memory (which       holds for sbrk).    DEFAULT_TRIM_THRESHOLD    DEFAULT_TOP_PAD  |