aboutsummaryrefslogtreecommitdiff
path: root/AT91SAM7S256/SAM7S256/Include/sam7s256.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-11 17:39:48 +0100
committerNicolas Schodet2012-02-11 17:40:50 +0100
commiteb584f8d27a856e8f4d2ddebdd1173ff04217946 (patch)
tree83bbf94ff00b0120c3e37aeb3f725561b03f1c5d /AT91SAM7S256/SAM7S256/Include/sam7s256.c
parent35d4c19a154b0b4366876783eacb13bec27d288c (diff)
parent99a4c90dee42104638933096728bebc45e28bf1a (diff)
Merge branch 'master'
Conflicts: AT91SAM7S256/SAM7S256/Include/Cstartup.S AT91SAM7S256/SAM7S256/Include/sam7s256.c AT91SAM7S256/SAM7S256/gcc/Makefile AT91SAM7S256/SAM7S256/gcc/nxt.ld AT91SAM7S256/Source/c_comm.c AT91SAM7S256/Source/c_comm.h
Diffstat (limited to 'AT91SAM7S256/SAM7S256/Include/sam7s256.c')
-rw-r--r--AT91SAM7S256/SAM7S256/Include/sam7s256.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/AT91SAM7S256/SAM7S256/Include/sam7s256.c b/AT91SAM7S256/SAM7S256/Include/sam7s256.c
index 8ff0ab4..b2657d5 100644
--- a/AT91SAM7S256/SAM7S256/Include/sam7s256.c
+++ b/AT91SAM7S256/SAM7S256/Include/sam7s256.c
@@ -11,7 +11,7 @@
//
// Platform C
//
-#ifdef __ARMDEBUG__
+#ifdef ARMDEBUG
#include "debug_stub.h"
#endif
@@ -21,7 +21,7 @@ void main(void)
{
HARDWAREInit;
mSchedInit();
-#ifdef __ARMDEBUG__
+#ifdef ARMDEBUG
dbg__bkpt_init();
#endif
while(TRUE == mSchedCtrl())