From a3ce96186627280a78d8edfbcae0c733cf548679 Mon Sep 17 00:00:00 2001
From: Harald Wolff <harald@das-wolff-rudel.de>
Date: Thu, 9 Nov 2017 10:13:26 +0100
Subject: [PATCH] Intermediate Commit while joining avr-fw-top

---
 core/src/bootloader.c               | 4 +---
 cpu/at90can128/src/at90can_timer0.c | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/bootloader.c b/core/src/bootloader.c
index b5787ba..0f381b7 100755
--- a/core/src/bootloader.c
+++ b/core/src/bootloader.c
@@ -15,9 +15,7 @@ char		flash_buffer[ SPM_PAGESIZE  ];
 uint8_t	bootloader(FILE *stream)
 {	
 	uint8_t	n;
-	int ch;
-	uint8_t	cmd;
-	
+	int ch;	
 	
 	for (n=0;n<10;n++)
 	{
diff --git a/cpu/at90can128/src/at90can_timer0.c b/cpu/at90can128/src/at90can_timer0.c
index 14073ed..1a28f42 100644
--- a/cpu/at90can128/src/at90can_timer0.c
+++ b/cpu/at90can128/src/at90can_timer0.c
@@ -1,5 +1,6 @@
 #include <avr/io.h>
-#include <sys/cpu.h>
+
+#include <cpu/cpu.h>
 #include <sys/systick.h>
 
 #ifdef __AVR_ATmega32__