diff --git a/arch/kvx/Makefile b/arch/kvx/Makefile
index 643ef28..9e7c8c0 100644
--- a/arch/kvx/Makefile
+++ b/arch/kvx/Makefile
@@ -2,8 +2,6 @@
 
 KBUILD_CPPFLAGS += -fno-strict-aliasing
 
-board-$(CONFIG_GENERIC) := generic
-
 KALLSYMS += --symbol-prefix=_
 
 ifeq ($(CROSS_COMPILE),)
diff --git a/arch/kvx/cpu/barebox.lds.S b/arch/kvx/cpu/barebox.lds.S
index 8d1944a..bf92564 100644
--- a/arch/kvx/cpu/barebox.lds.S
+++ b/arch/kvx/cpu/barebox.lds.S
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Kalray Inc.
  */
 
-#include <config.h>
 #include <asm/common.h>
 #include <asm/sys_arch.h>
 #include <asm-generic/barebox.lds.h>
diff --git a/arch/kvx/cpu/start.S b/arch/kvx/cpu/start.S
index a02900f..d90272c 100644
--- a/arch/kvx/cpu/start.S
+++ b/arch/kvx/cpu/start.S
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Kalray Inc.
  */
 
-#include <config.h>
 #include <linux/linkage.h>
 #include <asm/privilege.h>
 #include <asm/sys_arch.h>
diff --git a/drivers/clocksource/kvx_timer.c b/drivers/clocksource/kvx_timer.c
index f16d77b..4125ddb 100644
--- a/drivers/clocksource/kvx_timer.c
+++ b/drivers/clocksource/kvx_timer.c
@@ -27,7 +27,6 @@
 {
 	struct clk *clk;
 	uint32_t clk_freq;
-	struct device_node *np = dev->device_node;
 
 	/* Get clock frequency */
 	clk = clk_get(dev, NULL);