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

diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie
index 945f2fb..1c6c0be 100644 (file)
--- a/packages/linux/linux-rp-2.6.20/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.20/defconfig-collie
@@ -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

diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index 8da37cb..9ef9413 100644 (file)
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
 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 = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
 
 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 = "\