diff options
| author | px4dev <px4@purgatory.org> | 2013-01-11 00:39:22 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-11 00:39:22 -0800 |
| commit | ccf9882dc5dbe38b621110f82c4e2ff63aef900e (patch) | |
| tree | 18b0af628174bf27815dd52a376c8b72b6a626d4 /nuttx/mm | |
| parent | 40dfbf0d977729951d73bcb089ca8f89c7b83efe (diff) | |
| parent | 0f2decb70f505b108999fcdb80e89d7aae6760ce (diff) | |
| download | px4-firmware-ccf9882dc5dbe38b621110f82c4e2ff63aef900e.tar.gz px4-firmware-ccf9882dc5dbe38b621110f82c4e2ff63aef900e.tar.bz2 px4-firmware-ccf9882dc5dbe38b621110f82c4e2ff63aef900e.zip | |
Merge branch 'master' into nuttx-merge-5447
Diffstat (limited to 'nuttx/mm')
| -rw-r--r-- | nuttx/mm/mm_graninit.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nuttx/mm/mm_graninit.c b/nuttx/mm/mm_graninit.c index e43839ad6..8f811c65f 100644 --- a/nuttx/mm/mm_graninit.c +++ b/nuttx/mm/mm_graninit.c @@ -74,7 +74,6 @@ FAR struct gran_s *g_graninfo; * Perfrom common GRAN initialization. * * Input Parameters: - * info - Private granule data structure pointer * heapstart - Start of the granule allocation heap * heapsize - Size of heap in bytes * log2gran - Log base 2 of the size of one granule. 0->1 byte, @@ -207,7 +206,6 @@ gran_common_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran, #ifdef CONFIG_GRAN_SINGLE int gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran, uint8_t log2align) -int gran_initialize(FAR void *heapstart, size_t heapsize, uint8_t log2gran) { g_graninfo = gran_common_initialize(heapstart, heapsize, log2gran, log2align); |