diff --git a/drivers/media/i2c/max96712_tpg.c b/drivers/media/i2c/max96712_tpg.c
index 7c0d2a56..ce580634 100644
--- a/drivers/media/i2c/max96712_tpg.c
+++ b/drivers/media/i2c/max96712_tpg.c
@@ -21,8 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-/* Kernel version compatibility checks */
-#include <linux/version.h>
+#include <nvidia/conftest.h>
+
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
@@ -605,7 +605,12 @@ static const struct v4l2_subdev_internal_ops max96712_subdev_internal_ops = {
 	.open = max96712_open,
 };
 
+#if defined(NV_I2C_DRIVER_STRUCT_PROBE_WITHOUT_I2C_DEVICE_ID_ARG) /* Linux 6.3 */
 static int max96712_probe(struct i2c_client *client)
+#else
+static int max96712_probe(struct i2c_client *client,
+			  const struct i2c_device_id *id)
+#endif
 {
 	struct device *dev = &client->dev;
 	struct device_node *node = dev->of_node;
diff --git a/drivers/media/i2c/max96726_tpg.c b/drivers/media/i2c/max96726_tpg.c
index 805270ce..4a8c1fc1 100644
--- a/drivers/media/i2c/max96726_tpg.c
+++ b/drivers/media/i2c/max96726_tpg.c
@@ -21,6 +21,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvidia/conftest.h>
+
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
@@ -720,7 +722,12 @@ static const struct v4l2_subdev_internal_ops max96726_subdev_internal_ops = {
 	.open = max96726_open,
 };
 
+#if defined(NV_I2C_DRIVER_STRUCT_PROBE_WITHOUT_I2C_DEVICE_ID_ARG) /* Linux 6.3 */
 static int max96726_probe(struct i2c_client *client)
+#else
+static int max96726_probe(struct i2c_client *client,
+			  const struct i2c_device_id *id)
+#endif
 {
 	struct device *dev = &client->dev;
 	struct device_node *node = dev->of_node;