summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-09-14 22:45:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-09-14 22:45:50 +0000
commit60d19c2a86d4535f10a33a35cedd9c381fb6f592 (patch)
treedcb14971f7e68556d186cd2ce6c31fdc1c91ff5c /packages/linux
parent2d363fc768136bd0d6cdeb07aedb1d6715bdfab9 (diff)
parentd754a329cb5d4711db7a8cd5ac4e32b4d11016c3 (diff)
merge of '6880adb0bda3016728109ec284d7de4d080ab476'
and '73269b9ebb04f990b133f5ca5bca0225c4da0470'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-omap_git.bb6
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index a09e8f96d4..7107c1b5ba 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -6,10 +6,10 @@ KERNEL_IMAGETYPE = "uImage"
COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
-SRCREV = "74fcfe9c589f1060b5e5a791e9c0c54212d7c1b8"
+SRCREV = "de1121fdb899f762"
PV = "2.6.26+2.6.27-rc6+${PR}+git${SRCREV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -24,7 +24,6 @@ SRC_URI_append = " \
file://musb-dma-iso-in.eml;patch=1 \
file://musb-support-high-bandwidth.patch.eml;patch=1 \
file://musb-mru-otgfix.diff;patch=1 \
- file://16bpp.patch;patch=1 \
file://01-fix-timing-print.diff;patch=1 \
file://03-enable-overlay-opt.diff;patch=1 \
file://05-fix-display-panning.diff;patch=1 \
@@ -54,7 +53,6 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
"
SRC_URI_append_omap3evm = " \
- file://touchscreen.patch;patch=1 \
"
S = "${WORKDIR}/git"