From 3524f2ff0b07338cd0939d9c695a6bcbb2af39dd Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Thu, 27 Oct 2011 11:45:13 -0400 Subject: Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot" This reverts commit df9835efafd13685251749bc210c0b96a18a96a5, reversing changes made to ec45af8bfa9222a807c075dd1db4b5aa798bba03. Conflicts: hardware/arduino/variants/mega/pins_arduino.h libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino --- bootloaders/stk500v2/stk500boot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bootloaders/stk500v2/stk500boot.c') diff --git a/bootloaders/stk500v2/stk500boot.c b/bootloaders/stk500v2/stk500boot.c index 3d5b095..13dec89 100755 --- a/bootloaders/stk500v2/stk500boot.c +++ b/bootloaders/stk500v2/stk500boot.c @@ -95,8 +95,7 @@ LICENSE: #include "command.h" -//#if defined(_MEGA_BOARD_) || defined(_BOARD_AMBER128_) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__) -#if 0 +#if defined(_MEGA_BOARD_) || defined(_BOARD_AMBER128_) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__) #define ENABLE_MONITOR static void RunMonitor(void); #endif -- cgit v1.2.3-18-g5258