diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-11 13:21:33 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-11 13:21:33 +0000 |
| commit | c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b (patch) | |
| tree | 18bc9e860b1c571b02e09105903cf0dec01e36a8 /nuttx/arch/z16 | |
| parent | dffbc36a6adb56b217a399dd3acfebdd0f1dc5cf (diff) | |
| download | px4-nuttx-c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b.tar.gz px4-nuttx-c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b.tar.bz2 px4-nuttx-c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b.zip | |
Fix a typo that crept into lpc17_allocateheap.c in the recent kernel allocator changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5729 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z16')
| -rw-r--r-- | nuttx/arch/z16/src/common/up_initialize.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/nuttx/arch/z16/src/common/up_initialize.c b/nuttx/arch/z16/src/common/up_initialize.c index f06d8ff24..5c5e50999 100644 --- a/nuttx/arch/z16/src/common/up_initialize.c +++ b/nuttx/arch/z16/src/common/up_initialize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * common/up_initialize.c + * arch/z16/src/common/up_initialize.c * * Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -43,24 +43,17 @@ #include <nuttx/arch.h> #include <nuttx/fs/fs.h> -#include <nuttx/mm.h> #include <nuttx/ramlog.h> #include <arch/board/board.h> +#include "up_arch.h" #include "up_internal.h" /**************************************************************************** * Definitions ****************************************************************************/ -/* Define to enable timing loop calibration. CONFIG_DEBUG and - * CONFIG_ARCH_LOWPUTC must also be enabled in the .config file because - * the logic uses lldbg() - */ - -#undef CONFIG_ARCH_CALIBRATION - /**************************************************************************** * Public Data ****************************************************************************/ @@ -94,7 +87,7 @@ volatile FAR chipreg_t *current_regs; * ****************************************************************************/ -#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC) +#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG) static void up_calibratedelay(void) { int i; @@ -140,7 +133,7 @@ void up_initialize(void) up_calibratedelay(); - /* Add extra memory fragments to the memory manager */ + /* Add any extra memory fragments to the memory manager */ #if CONFIG_MM_REGIONS > 1 up_addregion(); |