Merge branch 'master' into kart

This commit is contained in:
Christian Kroll 2014-05-27 23:05:48 +02:00
commit 65cd081aa4
1 changed files with 1 additions and 1 deletions

View File

@ -869,7 +869,7 @@ ISR(TIMER1_COMPA_vect) {
defined (__AVR_ATmega1280__) || \
defined (__AVR_ATmega2560__)
TCCR2B = prescaler[plane];
#elif defined (__AVR_ATmega8__) \
#elif defined (__AVR_ATmega8__) || \
defined (__AVR_ATmega128__)
TCCR2 = prescaler[page];
#elif defined (__AVR_ATmega32U4__)