1 files changed, 2 insertions, 10 deletions

diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 2d051f432e..1f8b928d33 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -85,9 +85,6 @@ KERNEL_ALT_IMAGETYPE ??= ""
 kernel_do_compile() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
         oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-        if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
-                oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-        fi
         oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }
 
@@ -123,9 +120,7 @@ kernel_do_install() {
         install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION}
         [ -e Module.symvers ] && install -m 0644 Module.symvers ${D}/boot/Module.symvers-${KERNEL_VERSION}
         install -d ${D}/etc/modutils
-        if [ "${KERNEL_MAJOR_VERSION}" = "2.6" ]; then
-                install -d ${D}/etc/modprobe.d
-        fi
+        install -d ${D}/etc/modprobe.d
 
         #
         # Support for external module building - create a minimal copy of the
@@ -427,10 +422,7 @@ python populate_packages_prepend () {
                 # Write out any modconf fragment
                 modconf = bb.data.getVar('module_conf_%s' % basename, d, 1)
                 if modconf:
-                        if bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1) == "2.6":
-                                name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
-                        else:
-                                name = '%s/etc/modutils/%s.conf' % (dvar, basename)
+                        name = '%s/etc/modprobe.d/%s.conf' % (dvar, basename)
                         f = open(name, 'w')
                         f.write("%s\n" % modconf)
                         f.close()