From ec8544247c4257987b89f4e69afbac2cbb6ceb7c Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 17 Feb 2014 10:26:36 -0500 Subject: linux-ti-staging: drop SMP-disabling patch that breaks suspend/resume Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/linux-ti-staging_3.12.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/recipes-kernel/linux/linux-ti-staging_3.12.bb b/recipes-kernel/linux/linux-ti-staging_3.12.bb index 220495a5..2561e12b 100644 --- a/recipes-kernel/linux/linux-ti-staging_3.12.bb +++ b/recipes-kernel/linux/linux-ti-staging_3.12.bb @@ -40,7 +40,7 @@ SRCREV = "9d5b470605a6e5df5c46444c2b2c108d21f9a24a" PV = "3.12.10" # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild -MACHINE_KERNEL_PR_append = "e+gitr${SRCPV}" +MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}" PR = "${MACHINE_KERNEL_PR}" SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ @@ -51,11 +51,7 @@ SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;bra SRC_URI += "file://0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch \ file://0002-ARM-config-omap-Make-advanced-networking-features-as.patch \ file://0003-ARM-config-omap-Disable-extra-debug-options.patch \ - file://0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch \ " -SRC_URI_append_ti33x = "file://0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" -SRC_URI_append_ti43x = "file://0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" - # LCD resume fixes SRC_URI += "file://0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch \ file://0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch \ -- cgit v1.2.3-54-g00ecf