[oe-commits] org.oe.dev merge of 'b54b6efc8251bc5fce52afcb9a74272f2cea1bbb'

[Laibsch commit]

merge of 'b54b6efc8251bc5fce52afcb9a74272f2cea1bbb'
     and 'fc51ba6c6f78e661b51a328e391e78d3fa49d2d0'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 843d33548c0e77469b4859dd4e3b8c77590cb762
ViewMTN: http://monotone.openembedded.org/revision/info/843d33548c0e77469b4859dd4e3b8c77590cb762
Files:
1
packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
packages/linux/linux-tornado-omap2_2.6.16.16.bb
Diffs:

#
# mt diff -rb54b6efc8251bc5fce52afcb9a74272f2cea1bbb -r843d33548c0e77469b4859dd4e3b8c77590cb762
#
# 
# 
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
#  from [076ea04844ab570db5f22cfc2d543f19f9f2af3d]
#    to [8bfa3c79994262c6e40c21497b08d5d69367ac4e]
# 
============================================================
--- packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb	076ea04844ab570db5f22cfc2d543f19f9f2af3d
+++ packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb	8bfa3c79994262c6e40c21497b08d5d69367ac4e
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
@@ -86,13 +86,17 @@ SRC_URI_append_collie = "\
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
 SRC_URI_append_collie = "\
-           ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \
-           ${DOSRC}/collie/collie-r0.patch;patch=1 \
-           ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \
-           ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \
-           file://collie-mcp-r1.patch;patch=1 \
-           ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \
-#          ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/mtd-sharp-flash-hack-r3.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/mcp-sa11x0-r0.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomo-r0.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomo_spi-4.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie-kexec.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/sharpsl_pm-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie_pm-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomokeyb_suspendkey-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/ucb1x00_suspend.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie-ts.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/pcmcia_suspend.patch;patch=1 \
 "
 
 SRC_URI_append_tosa = "\


#
# mt diff -rfc51ba6c6f78e661b51a328e391e78d3fa49d2d0 -r843d33548c0e77469b4859dd4e3b8c77590cb762
#
# 
# 
# patch "packages/linux/linux-tornado-omap2_2.6.16.16.bb"
#  from [03dda467990161bcb196927a1060decb35dd3bd2]
#    to [a735d9e07c77baf8fa31bb48cda83957ab6af590]
# 
============================================================
--- packages/linux/linux-tornado-omap2_2.6.16.16.bb	03dda467990161bcb196927a1060decb35dd3bd2
+++ packages/linux/linux-tornado-omap2_2.6.16.16.bb	a735d9e07c77baf8fa31bb48cda83957ab6af590
@@ -1,6 +1,7 @@ LICENSE = "GPL"
 DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones."
 SECTION = "kernel"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
 	   http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;patch=1 \