diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2012-03-03 13:28:39 -0500 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2012-03-03 13:28:39 -0500 |
| commit | 74863e4bdfdfc162bf8c349afc5529768c74300f (patch) | |
| tree | 7568a8439b17294e195a2705f0245b40f02c80f6 /cores/arduino/WInterrupts.c | |
| parent | 8f5869009ccddad8698969ff2ebe204d7b574b37 (diff) | |
| parent | 4fade7007fbe2049f4f7a3867c9f9a76f8c06db1 (diff) | |
Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader
Conflicts:
.gitignore
Diffstat (limited to 'cores/arduino/WInterrupts.c')
| -rw-r--r-- | cores/arduino/WInterrupts.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c index 3c852ed..8f3ec84 100644 --- a/cores/arduino/WInterrupts.c +++ b/cores/arduino/WInterrupts.c @@ -133,8 +133,6 @@ void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) { #elif defined(MCUCR) && defined(ISC20) && defined(GIMSK) && defined(GIMSK) MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20); GIMSK |= (1 << INT2); - #else - #warning attachInterrupt may need some more work for this cpu (case 1) #endif break; #endif |