From 63240531781806cb440108ebd5ad0c3dc62510d3 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 11 Sep 2012 20:33:58 +0000
Subject: Update to granule allocator; Update to ENC28j60 driver

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5130 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/mm/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'nuttx/mm/Makefile')

diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile
index 7e6eb68a7..ef168f0db 100644
--- a/nuttx/mm/Makefile
+++ b/nuttx/mm/Makefile
@@ -36,10 +36,15 @@
 -include $(TOPDIR)/Make.defs
 
 ASRCS	= 
-AOBJS	= $(ASRCS:.S=$(OBJEXT))
 CSRCS	= mm_initialize.c mm_sem.c  mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \
 	  mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \
 	  mm_memalign.c mm_free.c mm_mallinfo.c
+
+ifeq ($(CONFIG_GRAN),y)
+CSRCS	= mm_graninit.c mm_granalloc.c mm_granfree.c
+endif
+
+AOBJS	= $(ASRCS:.S=$(OBJEXT))
 COBJS	= $(CSRCS:.c=$(OBJEXT))
 
 SRCS	= $(ASRCS) $(CSRCS)
-- 
cgit v1.2.3