diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2011-10-27 11:45:13 -0400 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2011-10-27 11:45:13 -0400 |
| commit | 3524f2ff0b07338cd0939d9c695a6bcbb2af39dd (patch) | |
| tree | 3a1ced5ef4198e9e40e06bc15a4cca5e106f5226 /bootloaders/stk500v2/stk500boot.c | |
| parent | ec93cd74a187a58f0e2bbe496c38edd7d9f33f30 (diff) | |
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
Diffstat (limited to 'bootloaders/stk500v2/stk500boot.c')
| -rwxr-xr-x | bootloaders/stk500v2/stk500boot.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 |