diff --git a/meta-beagle/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf
index ecd3a6e7..c7d72590 100644
--- a/meta-beagle/conf/machine/beaglebone-ai64.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64.conf
@@ -46,3 +46,9 @@ ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
 "
 
 MACHINE_GUI_CLASS = "bigscreen"
+
+# TI has moved a driver out of its kernel tree and into an out of tree module.
+# We need to not include that for older kernels since the module is still in
+# the kernel.
+TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = ""
+TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = ""
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 6264d5c8..b5ba448e 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -36,4 +36,8 @@ TFA_BOARD = "generic"
 
 OPTEEMACHINE = "k3-j721e"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ti-vxe-vxd-driver"
+TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver"
+TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""
+TI_VXE_VXD_DRIVER:bsp-ti-6_1 = ""
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw ${TI_VXE_VXD_DRIVER}"