merge of '9ac27641c9c3a76dca545c31690c7f5780076ff7'

     and 'e6282b8a6c27894ff62776a8cd275d5f0a9a0efd'

33 files changed, 39 insertions, 12 deletions

diff --git a/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty b/packages/linux/linux-rp-2.6.19+git/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.19+git/.mtn2git_empty
diff --git a/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch
index a80a1d5528..a80a1d5528 100644
--- a/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.19+git/add-oz-release-string.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.19+git/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-akita b/packages/linux/linux-rp-2.6.19+git/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-akita
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0 b/packages/linux/linux-rp-2.6.19+git/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-c7x0
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-collie b/packages/linux/linux-rp-2.6.19+git/defconfig-collie
index f488d42d93..f488d42d93 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-collie
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000 b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
index ea56989b75..ea56989b75 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-hx2000
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-poodle b/packages/linux/linux-rp-2.6.19+git/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-poodle
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm b/packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm
index abb6726556..abb6726556 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-qemuarm
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86 b/packages/linux/linux-rp-2.6.19+git/defconfig-qemux86
index fb66874b90..fb66874b90 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-qemux86
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-spitz b/packages/linux/linux-rp-2.6.19+git/defconfig-spitz
index 824fd57aaa..824fd57aaa 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-spitz
diff --git a/packages/linux/linux-rp-2.6.18+git/defconfig-tosa b/packages/linux/linux-rp-2.6.19+git/defconfig-tosa
index 4144e5cf38..4144e5cf38 100644
--- a/packages/linux/linux-rp-2.6.18+git/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.19+git/defconfig-tosa
diff --git a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch
index b09acacadd..b09acacadd 100644
--- a/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.19+git/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch
index 9ece71331a..9ece71331a 100644
--- a/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.19+git/pxa-serial-hack.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.19+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch
index 409daf03e6..409daf03e6 100644
--- a/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch
+++ b/packages/linux/linux-rp-2.6.19+git/sharpsl-pm-postresume-r1.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch
index 097659abad..405d4ec124 100644
--- a/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch
@@ -2182,7 +2182,7 @@ Index: git/fs/squashfs/inode.c
 +static struct inode *squashfs_alloc_inode(struct super_block *sb)
 +{
 +	struct squashfs_inode_info *ei;
-+	ei = kmem_cache_alloc(squashfs_inode_cachep, SLAB_KERNEL);
++	ei = kmem_cache_alloc(squashfs_inode_cachep, GFP_KERNEL);
 +	if (!ei)
 +		return NULL;
 +	return &ei->vfs_inode;
diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch b/packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch
index b6ce56eea4..b6ce56eea4 100644
--- a/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tmio-nand-r7.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch b/packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch
index 9fdd2962c9..9fdd2962c9 100644
--- a/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tmio-ohci-r6.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch b/packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch
index 2f1b47d783..2f1b47d783 100644
--- a/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tmio-tc6393-r8.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch b/packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch
index 00bac40db5..00bac40db5 100644
--- a/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tosa-keyboard-r18.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch b/packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch
index 624098bc64..624098bc64 100644
--- a/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tosa-lcdnoise-r1.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch b/packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch
index aef3a047c1..aef3a047c1 100644
--- a/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch
+++ b/packages/linux/linux-rp-2.6.19+git/tosa-tmio-lcd-r10.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch b/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch
index 78e81ea83a..78e81ea83a 100644
--- a/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch
+++ b/packages/linux/linux-rp-2.6.19+git/wm9712-reset-loop-r2.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch b/packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch
index 5179b47cc4..5179b47cc4 100644
--- a/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch
+++ b/packages/linux/linux-rp-2.6.19+git/wm9712-suspend-cold-res-r2.patch
diff --git a/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.19+git/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-rp_2.6.18+git.bb b/packages/linux/linux-rp_2.6.19+git.bb
index c25307cdec..f5af2ae05e 100644
--- a/packages/linux/linux-rp_2.6.18+git.bb
+++ b/packages/linux/linux-rp_2.6.19+git.bb
@@ -14,31 +14,31 @@ DEFAULT_PREFERENCE = "-1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ae99a78af33f00565a05dbbc6ca9b247fed002c5 \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.20-rc1 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
+           ${RPSRC}/pxafb_fix_params-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
-           ${RPSRC}/pxa_keys-r5.patch;patch=1 \
-           ${RPSRC}/tsc2101-r14.patch;patch=1 \
+           ${RPSRC}/pxa_keys-r6.patch;patch=1 \
+           ${RPSRC}/tsc2101-r15.patch;patch=1 \
            ${RPSRC}/hx2750_test1-r4.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r6.patch;patch=1 \
-           ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \
+           ${RPSRC}/pxa25x_cpufreq-r2.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/usb_pxa27x_udc-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
+           ${RPSRC}/usb_pxa27x_udc-r3.patch;patch=1 \
            ${DOSRC}/kexec-arm-r3.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
-           ${RPSRC}/pxa27x_overlay-r3.patch;patch=1 \
+           ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
-           file://add-oz-release-string.patch;patch=1;status=unmergable \
            ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
            ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
            ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
diff --git a/packages/linux/linux-rp_2.6.19.bb b/packages/linux/linux-rp_2.6.19.bb
index b13b127722..3f0472ecdd 100644
--- a/packages/linux/linux-rp_2.6.19.bb
+++ b/packages/linux/linux-rp_2.6.19.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -16,6 +16,8 @@ DEFAULT_PREFERENCE = "-1"
 # Hacks should clearly named and at the bottom
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.12.4.patch;patch=1 \
+           ${RPSRC}/pxafb_fix_params-r1.patch;patch=1 \
+           ${RPSRC}/pxa_irda_susres_fix-r0.patch;patch=1 \
            ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -27,12 +29,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2 \
            ${RPSRC}/pxa25x_cpufreq-r1.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/usb_pxa27x_udc-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
+           ${RPSRC}/usb_pxa27x_udc-r2.patch;patch=1 \
            ${DOSRC}/kexec-arm-r3.patch;patch=1 \
            ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \
            ${RPSRC}/poodle_pm-r3.patch;patch=1 \
-           ${RPSRC}/pxa27x_overlay-r3.patch;patch=1 \
+           ${RPSRC}/pxa27x_overlay-r4.patch;patch=1 \
            ${RPSRC}/w100_extaccel-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty b/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/madwifi/madwifi-ng-r1844-20061208/.mtn2git_empty
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch
new file mode 100644
index 0000000000..f285540d06
--- /dev/null
+++ b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-be-elf-copts.patch
@@ -0,0 +1,12 @@
+Index: madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc
+===================================================================
+--- madwifi-ng-r1844-20061208.orig/hal/public/xscale-be-elf.inc
++++ madwifi-ng-r1844-20061208/hal/public/xscale-be-elf.inc
+@@ -77,5 +77,5 @@ AH_REGOPS_FUNC=1
+ 
+ LDOPTS=	-EB
+ COPTS+=	-DAH_BYTE_ORDER=AH_BIG_ENDIAN
+-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \
+-	-mtune=xscale  -mshort-load-bytes
++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \
++	-mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch
new file mode 100644
index 0000000000..3224324699
--- /dev/null
+++ b/packages/madwifi/madwifi-ng-r1844-20061208/10-xscale-le-elf-copts.patch
@@ -0,0 +1,10 @@
+Index: madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc
+===================================================================
+--- madwifi-ng-r1844-20061208.orig/hal/public/xscale-le-elf.inc
++++ madwifi-ng-r1844-20061208/hal/public/xscale-le-elf.inc
+@@ -79,4 +79,4 @@ AH_REGOPS_FUNC=1
+ LDOPTS=	-EL
+ COPTS+=	-DAH_BYTE_ORDER=AH_LITTLE_ENDIAN
+ COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \
+-	-mapcs-32 -mtune=xscale  -mshort-load-bytes
++	-mtune=xscale -msoft-float -mfp=2
diff --git a/packages/madwifi/madwifi-ng_r1844-20061208.bb b/packages/madwifi/madwifi-ng_r1844-20061208.bb
new file mode 100644
index 0000000000..42d8ccafe4
--- /dev/null
+++ b/packages/madwifi/madwifi-ng_r1844-20061208.bb
@@ -0,0 +1,3 @@
+PR = "r0"
+
+require madwifi-ng_r.inc
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 4e39aa6ace..6a8e43ec9c 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 do_compile() {
 	(
 	 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-	 oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
+	 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys	
 	) || exit 1
 		rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake