diff --git a/src/drivers/barometer/invensense/Kconfig b/src/drivers/barometer/invensense/Kconfig
new file mode 100644
index 0000000000..772bb882e8
--- /dev/null
+++ b/src/drivers/barometer/invensense/Kconfig
@@ -0,0 +1,3 @@
+menu "Invensense"
+rsource "*/Kconfig"
+endmenu #Invensense
diff --git a/src/drivers/barometer/invensense/icp10100/CMakeLists.txt b/src/drivers/barometer/invensense/icp10100/CMakeLists.txt
index 7b7ffadab8..d00ea60bcc 100755
--- a/src/drivers/barometer/invensense/icp10100/CMakeLists.txt
+++ b/src/drivers/barometer/invensense/icp10100/CMakeLists.txt
@@ -32,7 +32,7 @@
 ############################################################################
 
 px4_add_module(
-	MODULE drivers__invensense__icp10100
+	MODULE drivers__barometer__invensense__icp10100
 	MAIN icp10100
 	COMPILE_FLAGS
 	SRCS
diff --git a/src/drivers/barometer/invensense/icp10100/ICP10100.cpp b/src/drivers/barometer/invensense/icp10100/ICP10100.cpp
index 437b05b641..836194e16e 100755
--- a/src/drivers/barometer/invensense/icp10100/ICP10100.cpp
+++ b/src/drivers/barometer/invensense/icp10100/ICP10100.cpp
@@ -233,7 +233,6 @@ ICP10100::RunImpl()
 				float b = (_pcal[0] - a) * (s1 + c);
 				float _pressure_Pa = a + b / (c + _raw_p);
 
-				const hrt_abstime nowx = hrt_absolute_time();
 				float temperature = _temperature_C;
 				float pressure = _pressure_Pa;
 
diff --git a/src/drivers/barometer/invensense/icp10100/Kconfig b/src/drivers/barometer/invensense/icp10100/Kconfig
new file mode 100644
index 0000000000..f5ee5a5139
--- /dev/null
+++ b/src/drivers/barometer/invensense/icp10100/Kconfig
@@ -0,0 +1,7 @@
+menuconfig DRIVERS_BAROMETER_INVENSENSE_ICP10100
+	bool "icp10100"
+	default n
+	---help---
+		Enable support for icp10100
+
+
diff --git a/src/drivers/barometer/invensense/icp10111/CMakeLists.txt b/src/drivers/barometer/invensense/icp10111/CMakeLists.txt
index ec2a3858b9..b0771e222d 100755
--- a/src/drivers/barometer/invensense/icp10111/CMakeLists.txt
+++ b/src/drivers/barometer/invensense/icp10111/CMakeLists.txt
@@ -32,7 +32,7 @@
 ############################################################################
 
 px4_add_module(
-	MODULE drivers__invensense__icp10111
+	MODULE drivers__barometer__invensense__icp10111
 	MAIN icp10111
 	COMPILE_FLAGS
 	SRCS
diff --git a/src/drivers/barometer/invensense/icp10111/Kconfig b/src/drivers/barometer/invensense/icp10111/Kconfig
new file mode 100644
index 0000000000..1681c07d38
--- /dev/null
+++ b/src/drivers/barometer/invensense/icp10111/Kconfig
@@ -0,0 +1,6 @@
+menuconfig DRIVERS_BAROMETER_INVENSENSE_ICP10111
+	bool "icp10100"
+	default n
+	---help---
+		Enable support for icp10111
+
diff --git a/src/drivers/drv_sensor.h b/src/drivers/drv_sensor.h
index 4547f28cec..47e9c352b4 100644
--- a/src/drivers/drv_sensor.h
+++ b/src/drivers/drv_sensor.h
@@ -213,6 +213,9 @@
 #define DRV_FLOW_DEVTYPE_PX4FLOW 0xB5
 #define DRV_FLOW_DEVTYPE_PAA3905 0xB6
 
+#define DRV_BARO_DEVTYPE_ICP10100 0xC0
+#define DRV_BARO_DEVTYPE_ICP10111 0xC1
+
 #define DRV_DEVTYPE_UNUSED		0xff
 
 #endif /* _DRV_SENSOR_H */