Merge branch 'develop' into 'master'

Develop See merge request !36
2016-09-16 10:24:57 +00:00
parent cf892196b0 c8702a57fe
commit 9425d132b0
2 changed files with 4 additions and 2 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
  SW_KERNEL: "0"
  SW_MAJOR: "1"
-  SW_MINOR: "7"
+  SW_MINOR: "8"

 before_script:
  - "echo $CI_BUILD_ID"
--- a/source/firmware/arch/stm32f4xx/driver/stm32f4_rng.c
+++ b/source/firmware/arch/stm32f4xx/driver/stm32f4_rng.c
@@ -7,7 +7,9 @@

 #include <stddef.h>

-#include "board.h"
+#include "rng.h"
+#include "stm32f4xx.h"
+#include "stm32f4_rng.h"

 int stm32f4_rng_open(const void *this)
 {