diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass
index fe1ea65..0d30611 100644
--- a/eclass/nas-kernel.eclass
+++ b/eclass/nas-kernel.eclass
@@ -491,9 +491,12 @@ _kernel_src_compile() {
 		K_NASKERNEL_DEVICE="Buffalo Linkstation LiveV3 (LS-CHL)"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_chl2" ]; then
-		#devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811067,4' # Linkstation XHL/CHLv2 (2.6.30)
-		# new Device tree no need for devio
-		K_NASKERNEL_DTB="kirkwood-lschlv2.dtb"
+		if [[ "${KV_MAJOR}${KV_MINOR}" -ge 36 ]]; then
+			# new Device tree no need for devio
+			K_NASKERNEL_DTB="kirkwood-lschlv2.dtb"
+		else
+			devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811067,4' # Linkstation XHL/CHLv2 (2.6.30)
+		fi
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo LS-XHL Series"
 	fi
@@ -539,9 +542,12 @@ _kernel_src_compile() {
 		K_NASKERNEL_DEVICE="Buffalo Linkstation Pro/Live"
 	fi
 	if [ "${K_NASKERNEL_NAME}" = "buffalo_ls_xhl" ]; then
-		#devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811067,4' # Linkstation XHL/CHLv2 (2.6.30)
-		# new Device tree no need for devio
-		K_NASKERNEL_DTB="kirkwood-lsxhl.dtb"
+		if [[ "${KV_MAJOR}${KV_MINOR}" -ge 36 ]]; then
+			# new Device tree no need for devio
+			K_NASKERNEL_DTB="kirkwood-lsxhl.dtb"
+		else
+			devio > foo 'wl 0xe3a01c0a,4' 'wl 0xe3811067,4' # Linkstation XHL/CHLv2 (2.6.30)
+		fi
 		K_NASKERNEL_TYPE="buffalo"
 		K_NASKERNEL_DEVICE="Buffalo LS-XHL Series"
 	fi