diff options
| author | px4dev <px4@purgatory.org> | 2013-01-14 21:01:58 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-14 21:01:58 -0800 |
| commit | 854c6436b4e3b292fd04843795d0369dc8856783 (patch) | |
| tree | 4d5602f5c70926d2dcd01294561ddd8df4378462 /nuttx/mm/mm_graninit.c | |
| parent | 6d138a845aabad31060bd00da0d20d177d3f4be4 (diff) | |
| parent | c38ad4ded570eddadeeca3579d02dfc63dcc8a9d (diff) | |
| download | px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.tar.gz px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.tar.bz2 px4-firmware-854c6436b4e3b292fd04843795d0369dc8856783.zip | |
Pull NuttX up to the 6.24 release.
Merge branch 'nuttx-merge-5447'
Diffstat (limited to 'nuttx/mm/mm_graninit.c')
| -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); |