[oe-commits] org.oe.dev linux-rp-2.6.19+git: Fix two compile failures

[rpurdie commit]

linux-rp-2.6.19+git: Fix two compile failures

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924
Files:
1
packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch
packages/linux/linux-rp_2.6.19+git.bb
Diffs:

#
# mt diff -r7a92cecf76fb0fd68420071b2ef0662abbf99804 -r1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924
#
# 
# 
# patch "packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch"
#  from [11e2d6fdc9e13248f823ef03703961498d9bda0d]
#    to [3db9db15a38fb2858d8549a689065c5c42794f3a]
# 
# patch "packages/linux/linux-rp_2.6.19+git.bb"
#  from [d6689dcce051b23524ec024b6f0c1f04df8e3a5a]
#    to [c941afa3a4bd31df04ee7c8b67ace6194654bfd1]
# 
============================================================
--- packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch	11e2d6fdc9e13248f823ef03703961498d9bda0d
+++ packages/linux/linux-rp-2.6.19+git/squashfs3.0-2.6.15.patch	3db9db15a38fb2858d8549a689065c5c42794f3a
@@ -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;
============================================================
--- packages/linux/linux-rp_2.6.19+git.bb	d6689dcce051b23524ec024b6f0c1f04df8e3a5a
+++ packages/linux/linux-rp_2.6.19+git.bb	c941afa3a4bd31df04ee7c8b67ace6194654bfd1
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -29,7 +29,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r3.patch;patch=1 \
-           ${RPSRC}/usb_pxa27x_udc-r2.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 \