From cdcfdfc054aed8f5158bf12d9c4450b3c1ee8ae1 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Wed, 8 Feb 2012 00:00:18 +0100 Subject: fix some merge mistakes --- AT91SAM7S256/Source/d_loader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AT91SAM7S256/Source/d_loader.h') diff --git a/AT91SAM7S256/Source/d_loader.h b/AT91SAM7S256/Source/d_loader.h index d550fa8..6a59c98 100644 --- a/AT91SAM7S256/Source/d_loader.h +++ b/AT91SAM7S256/Source/d_loader.h @@ -23,7 +23,7 @@ #define STARTOFUSERFLASH (0x125800L)//(0x124600L) 1.31 == (0x122100L) #else #define STARTOFUSERFLASH (0x122400L)//(0x124600L) 1.31 == (0x122100L) -#endif +#endif #define SIZEOFUSERFLASH_MAX SIZEOFUSERFLASH #else extern char __STARTOFUSERFLASH_FROM_LINKER; -- cgit v1.2.3