aboutsummaryrefslogtreecommitdiffhomepage
path: root/AT91SAM7S256/Source/d_loader.h
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-08 00:00:18 +0100
committerNicolas Schodet2012-02-08 00:00:32 +0100
commitcdcfdfc054aed8f5158bf12d9c4450b3c1ee8ae1 (patch)
tree8dd17090cbf30771e48eaae531c054ec3d693854 /AT91SAM7S256/Source/d_loader.h
parentc331530002825a86f12151266a9772167a3a49ce (diff)
fix some merge mistakes
Diffstat (limited to 'AT91SAM7S256/Source/d_loader.h')
-rw-r--r--AT91SAM7S256/Source/d_loader.h2
1 files changed, 1 insertions, 1 deletions
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;