deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
This commit is contained in:
Mariano Alvira 2012-11-18 18:27:39 -05:00
commit 2c9a538582
47 changed files with 1008 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cpu/mc1322x/lib/include/mc1322x.h
View file

@ -50,5 +50,6 @@
#include "i2c.h"
#include "rtc.h"
#include "adc.h"
#include "pwm.h"
#endif