[oe-commits] org.oe.dev linux-rp 2.6.20: add collie suspend patches from OE bug #2323

[thommy commit]

linux-rp 2.6.20: add collie suspend patches from OE bug #2323

Author: thommy at tabao.de
Branch: org.openembedded.dev
Revision: 48b3ebe818c6d71c00ae88870e198d7a6aaab977
ViewMTN: http://monotone.openembedded.org/revision.psp?id=48b3ebe818c6d71c00ae88870e198d7a6aaab977
Files:
1
packages/linux/linux-rp-2.6.20/defconfig-collie
packages/linux/linux-rp_2.6.20.bb
Diffs:

#
# mt diff -r6ba793f4e899f7f748c7e3172c1d338db1005e00 -r48b3ebe818c6d71c00ae88870e198d7a6aaab977
#
# 
# 
# patch "packages/linux/linux-rp-2.6.20/defconfig-collie"
#  from [814a9b24546da3bf66682054878d9b889c303d64]
#    to [53804a4fd6eda673edf99244c4c3c8ea0ed64a87]
# 
# patch "packages/linux/linux-rp_2.6.20.bb"
#  from [e1c102e405507247f70e6eb20c86f82e7d77f0c3]
#    to [561a51a3e89dbf4ab4f14db0b87cec6a4498d0eb]
# 
============================================================
--- packages/linux/linux-rp-2.6.20/defconfig-collie	814a9b24546da3bf66682054878d9b889c303d64
+++ packages/linux/linux-rp-2.6.20/defconfig-collie	53804a4fd6eda673edf99244c4c3c8ea0ed64a87
@@ -254,7 +254,7 @@ CONFIG_PM=y
 # CONFIG_PM_LEGACY is not set
 # CONFIG_PM_DEBUG is not set
 # CONFIG_PM_SYSFS_DEPRECATED is not set
-CONFIG_APM=m
+CONFIG_APM=y
 
 #
 # Networking
@@ -1394,7 +1394,7 @@ CONFIG_USB_EZUSB=y
 #
 # USB Gadget Support
 #
-CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
============================================================
--- packages/linux/linux-rp_2.6.20.bb	e1c102e405507247f70e6eb20c86f82e7d77f0c3
+++ packages/linux/linux-rp_2.6.20.bb	561a51a3e89dbf4ab4f14db0b87cec6a4498d0eb
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r16"
+PR = "r17"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -80,7 +80,6 @@ SRC_URI_append_collie = "\
 
 SRC_URI_append_collie = "\
  	   ${TKSRC}/mtd-sharp-flash-hack-r2.patch;patch=1 \
- 	   ${TKSRC}/collie-r3.patch;patch=1 \
            ${TKSRC}/ucb1x00-touch-audio-r1.patch;patch=1 \
  	   ${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \
  	   ${TKSRC}/sa1100-udc-r2.patch;patch=1 \
@@ -88,6 +87,11 @@ SRC_URI_append_collie = "\
  	   ${TKSRC}/locomo-r0.patch;patch=1 \
  	   ${TKSRC}/collie-kexec.patch;patch=1 \
  	   ${TKSRC}/locomo_spi-r3.patch;patch=1 \
+ 	   ${TKSRC}/sharpsl_pm.patch;patch=1 \
+ 	   ${TKSRC}/collie_pm-2.patch;patch=1 \
+ 	   ${TKSRC}/locomokeyb_suspendkey.patch;patch=1 \
+ 	   ${TKSRC}/pcmcia_suspend.patch;patch=1 \
+ 	   ${TKSRC}/ucb1x00_suspend.patch;patch=1 \
 "
 
 SRC_URI_append_tosa = "\