diff options
-rw-r--r-- | meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc | 2 | ||||
-rw-r--r-- | meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc | 22 |
2 files changed, 3 insertions, 21 deletions
diff --git a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc index 3526a18f714e..a2094ef2850a 100644 --- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc +++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc @@ -5,6 +5,8 @@ define KARCH i386 include ktypes/standard branch emenlow +git merge emgd-1.14 + include emenlow.scc # default policy for standard kernels diff --git a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc index d688ee557c59..a705e72ff8cd 100644 --- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc +++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc @@ -1,7 +1,7 @@ include cfg/x86.scc include features/intel-e1xxxx/intel-e100.scc include features/intel-e1xxxx/intel-e1xxxx.scc -include features/drm-psb/drm-psb.scc +include features/drm-emgd/drm-emgd.scc include cfg/8250.scc include cfg/vesafb.scc @@ -10,23 +10,3 @@ include features/usb/uhci-hcd.scc kconf hardware emenlow.cfg kconf non-hardware reboot-quirk.cfg - -patch drm-add-the-base-source-of-the-Poulsbo-psb-2D-X11-dr.patch -patch drm-psb-remove-the-package-Makefile-and-replace-it-w.patch -patch drm-apply-psb-kernel-source-package-s-build.patch.patch -patch drm-intel_ldvs.c-add-missing-arg-to-backlight_device.patch -patch emenlow-switch-to-psb.patch -patch drm-Fix-psb-ioctl-assignment.patch -patch drm-psb-remove-BKL-remnants.patch -patch drm-psb-update-spinlock-initializers.patch -patch drm-psb-remove-call-to-agp_flush_chipset.patch -patch drm-psb-remove-includes-of-nonexistent-i2c-id.h.patch -patch drm-psb-remove-assigment-to-deprecated-i2c_adapter.i.patch -patch drm-psb-use-console_lock-unlock.patch -patch drm-psb-add-DRM_UNLOCKED-flag.patch -patch drm-psb-mark-unlocked-ioctls.patch -patch drm-psb-initialize-backlight-type.patch -patch drm-psb-fix-ioremap-calls.patch -patch drm-psb-change-udelay-to-mdelay-in-intel_wait_for_vb.patch -patch bsp-emenlow-initialize-lvds-backlight-only-if-lvds-e.patch -patch bsp-emenlow-give-up-drm_global_mutex-on-contention-i.patch |