merge of a4c0e74f4178cfd572d5dfe0f9b2b8d920172816

     and e4f6787633b4d486e7052126b91dadaf9a933dff

diff --cc packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index f96a086,2842eea..0bae9c5
--- 1/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
--- 2/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@@ -92,12 -79,23 +92,14 @@@ SRC_URI = "ftp://ftp.kernel.org/pub/lin
             ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
             ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
             ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
 -           ${RPSRC}/pxafb_hsync-r0.patch;patch=1 \
 -           ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
 -           ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
 -           ${RPSRC}/sharpsl_lcd-r0.patch;patch=1 \
 -           ${RPSRC}/sharpsl_ts-r0.patch;patch=1 \
 -           ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \
 -           ${RPSRC}/spitz_base-r7.patch;patch=1 \
 -           ${RPSRC}/spitzkbd-r1.patch;patch=1 \
 -           ${RPSRC}/spitzcf-r1.patch;patch=1 \
 -           ${RPSRC}/spitz_power-r3.patch;patch=1 \
 -           ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
 -           ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
 +           ${RPSRC}/spitz_base-r8.patch;patch=1 \
 +           ${RPSRC}/spitz_pm-r0.patch;patch=1 \
             ${RPSRC}/scoop_susres-r0.patch;patch=1 \
+            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
             ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \
 +           ${RPSRC}/mmc_timeout-r0.patch;patch=1 \       
             ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
+            ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
             file://add-oz-release-string.patch;patch=1 \
             file://add-elpp-stuff.patch;patch=1 \
             file://pxa-serial-hack.patch;patch=1 \
@@@ -156,11 -154,6 +158,10 @@@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROO
  # Enable or disable ELPP via local.conf - default is "no"
  #
  ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
- 
 +###############################################################
 +# module configs specific to this kernel
 +#
 +module_autoload_pxaficp_ir = "pxaficp_ir"
  
  do_configure() {