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

Conflicts:
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/src/default_lowlevel.c
This commit is contained in:
Mariano Alvira 2011-07-08 19:21:15 -04:00
commit e2d74fa0a5
15 changed files with 367 additions and 25 deletions

View file

@ -42,6 +42,7 @@
void default_vreg_init(void);
void uart1_init(uint16_t inc, uint16_t mod, uint8_t samp);
void uart2_init(uint16_t inc, uint16_t mod, uint8_t samp);
void irq_register_timer_handler(int timer, void (*isr)(void));