Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x

Conflicts: cpu/mc1322x/src/default_lowlevel.c
2011-07-18 07:25:19 -04:00 · 2011-07-18 07:25:19 -04:00 · 485d6716e0
commit 485d6716e0
parent 656e80b57a 76a8e49262
6 changed files with 474 additions and 3 deletions
--- a/cpu/mc1322x/lib/include/isr.h
+++ b/cpu/mc1322x/lib/include/isr.h
@ -169,5 +169,6 @@ extern void maca_isr(void) __attribute__((weak));

 extern void asm_isr(void) __attribute__((weak));

+extern void i2c_isr(void) __attribute__((weak));

 #endif