aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32/f1/lisa-m-2/usart_dma
diff options
context:
space:
mode:
authorchrysn2012-10-18 18:43:38 +0200
committerchrysn2012-10-18 18:43:44 +0200
commit47c69695ce03614f2279e3ee4d83ca07034af6c7 (patch)
treee0baaea999a68b7b9d62e988c3116322fa40a793 /examples/stm32/f1/lisa-m-2/usart_dma
parentb5de267b0671493d138f940c25f21f834f7275c4 (diff)
parent771f504757e0ac5553c95308ce66412b417fa8d1 (diff)
Merge branch 'generalizations' into efm32
Conflicts: Makefile
Diffstat (limited to 'examples/stm32/f1/lisa-m-2/usart_dma')
-rw-r--r--examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c b/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
index ac3bb3c..369c539 100644
--- a/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
+++ b/examples/stm32/f1/lisa-m-2/usart_dma/usart_dma.c
@@ -21,7 +21,7 @@
#include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/usart.h>
#include <libopencm3/stm32/f1/dma.h>
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/cm3/nvic.h>
void clock_setup(void)
{