diff --git a/ddcci/ddcci.c b/ddcci/ddcci.c
index 586b6e29b48439e4b6132295c14891e938fe3dbb..ea76352904bb1920a9a816691d30d51591c803fa 100644
--- a/ddcci/ddcci.c
+++ b/ddcci/ddcci.c
@@ -1785,6 +1785,13 @@ static int ddcci_remove(struct i2c_client *client)
 	return 0;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+static void ddcci_remove_void(struct i2c_client *client)
+{
+	ddcci_remove(client);
+}
+#endif
+
 /*
  * I2C driver device identification table.
  */
@@ -1806,7 +1813,11 @@ static struct i2c_driver ddcci_driver = {
 
 	.id_table	= ddcci_idtable,
 	.probe		= ddcci_probe,
+	#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+	.remove		= ddcci_remove_void,
+	#else
 	.remove		= ddcci_remove,
+	#endif
 	.class		= I2C_CLASS_DDC,
 	.detect		= ddcci_detect,
 	.address_list	= I2C_ADDRS(
