summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-08-04 16:25:51 +0200
committerKoen Kooi <koen@openembedded.org>2010-08-04 16:26:31 +0200
commitdf7c4382350c94824f21188d99f394e670302768 (patch)
treec4e9bd280a6088dd8474e789d0a464d2e9a48bc0
parent07076390358f211bd96779bec2d6eb5eaa0ad699 (diff)
downloadopenembedded-df7c4382350c94824f21188d99f394e670302768.tar.gz
linux-omap-psp 2.6.32: remove duplicate patch
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--recipes/linux/linux-omap-psp_2.6.32.bb1
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 3f89953890..7c30288561 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r85"
+MACHINE_KERNEL_PR = "r86"
KERNEL_IMAGETYPE = "uImage"
diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb
index c052fdce08..5c1287bc7e 100644
--- a/recipes/linux/linux-omap-psp_2.6.32.bb
+++ b/recipes/linux/linux-omap-psp_2.6.32.bb
@@ -128,7 +128,6 @@ SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=gi
file://cam/0069-mt9t112-Fix-pll-p-dividers-abstraction.patch \
file://cam/0070-mt9t112-Adjust-50-60Hz-flickering-settings.patch \
file://cam/0071-mt9t112-Trigger-autofocus-at-the-end-of-context-swit.patch \
- file://cam/0001-omap3beagle-Partial-revert-HACK-try-to-poweron-stuff.patch \
file://cam/0002-omap3beagle-camera-Fix-dual-sensor-registration.patch \
file://cam/0003-mt9v113-Fix-State-variable-handling.patch \
file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \