diff options
author | Denys Dmytriyenko <denys@ti.com> | 2014-02-17 10:26:36 -0500 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2014-02-17 10:29:05 -0500 |
commit | 7969c525c26dde8b601b7122b95182c9cce3f65c (patch) | |
tree | 48dac7b1d28c85cf43b5c5a4a20cf119bfcc9983 /recipes-kernel | |
parent | 90108cdd05000213c3163b784906a01a968f8b52 (diff) | |
download | meta-ti-7969c525c26dde8b601b7122b95182c9cce3f65c.tar.gz |
linux-ti-staging: drop SMP-disabling patch that breaks suspend/resume
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_3.12.bb | 6 |
1 files changed, 1 insertions, 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" | |||
40 | PV = "3.12.10" | 40 | PV = "3.12.10" |
41 | 41 | ||
42 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 42 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
43 | MACHINE_KERNEL_PR_append = "e+gitr${SRCPV}" | 43 | MACHINE_KERNEL_PR_append = "f+gitr${SRCPV}" |
44 | PR = "${MACHINE_KERNEL_PR}" | 44 | PR = "${MACHINE_KERNEL_PR}" |
45 | 45 | ||
46 | SRC_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git;protocol=git;branch=${BRANCH} \ | 46 | 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 | |||
51 | SRC_URI += "file://0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch \ | 51 | SRC_URI += "file://0001-ARM-config-omap-Sync-up-omap2plus-defconfig-with-sav.patch \ |
52 | file://0002-ARM-config-omap-Make-advanced-networking-features-as.patch \ | 52 | file://0002-ARM-config-omap-Make-advanced-networking-features-as.patch \ |
53 | file://0003-ARM-config-omap-Disable-extra-debug-options.patch \ | 53 | file://0003-ARM-config-omap-Disable-extra-debug-options.patch \ |
54 | file://0005-ARM-OMAP-Kill-warning-in-CPUIDLE-code-with-CONFIG_SM.patch \ | ||
55 | " | 54 | " |
56 | SRC_URI_append_ti33x = "file://0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" | ||
57 | SRC_URI_append_ti43x = "file://0004-Not-for-merge-ARM-config-omap-Disable-SMP-for-AM335x.patch" | ||
58 | |||
59 | # LCD resume fixes | 55 | # LCD resume fixes |
60 | SRC_URI += "file://0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch \ | 56 | SRC_URI += "file://0001-ARM-OMAP2-am43xx-Use-omap4-prm-context-ops.patch \ |
61 | file://0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch \ | 57 | file://0002-ARM-OMAP2-omap_hwmod-Add-context-ops-to-am43xx-soc_ops.patch \ |