1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

linux-rp-2.6.23+2.6.24: Add missing patches

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2912 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-10-19 10:35:27 +00:00
parent 62c6e3ef89
commit aec382b478
3 changed files with 49 additions and 1 deletions
@@ -0,0 +1,29 @@
---
drivers/mmc/core/sd.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: linux-2.6.23/drivers/mmc/core/sd.c
===================================================================
--- linux-2.6.23.orig/drivers/mmc/core/sd.c 2007-10-17 11:33:26.000000000 +0200
+++ linux-2.6.23/drivers/mmc/core/sd.c 2007-10-17 11:33:49.000000000 +0200
@@ -173,14 +173,15 @@
scr_struct = UNSTUFF_BITS(resp, 60, 4);
if (scr_struct != 0) {
- printk(KERN_ERR "%s: unrecognised SCR structure version %d\n",
+ printk(KERN_WARNING "%s: unrecognised SCR structure version %d\n",
mmc_hostname(card->host), scr_struct);
- return -EINVAL;
+ scr->sda_vsn = 0;
+ scr->bus_widths = 0;
+ } else {
+ scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
+ scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
}
- scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
- scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
-
return 0;
}
@@ -0,0 +1,17 @@
From: Marcin Juszkiewicz <openembedded@haerwu.biz>
drivers/video/w100fb.c: In function w100fb_imageblit:
drivers/video/w100fb.c:507: warning: unused variable par
Signed-off-by: Marcin Juszkiewicz <openembedded@haerwu.biz>
--- linux-2.6.23/drivers/video/w100fb.c 2007-10-11 16:52:30.000000000 +0200
+++ linux-2.6.23/drivers/video/w100fb.c 2007-10-15 12:56:01.000000000 +0200
@@ -504,7 +504,6 @@ static void w100_hostdata(u32 width, u32
static void w100fb_imageblit(struct fb_info *info,
const struct fb_image *image)
{
- struct w100fb_par *par = info->par;
union dp_gui_master_cntl_u gmc;
u32 fgcolor, bgcolor;
@@ -1,6 +1,6 @@
require linux-rp.inc
PR = "r0"
PR = "r1"
DEFAULT_PREFERENCE = "-1"
@@ -36,12 +36,14 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
${RPSRC}/pxa27x_overlay-r7.patch;patch=1 \
${RPSRC}/w100_extaccel-r1.patch;patch=1 \
${RPSRC}/w100_extmem-r1.patch;patch=1 \
file://w100fb-unused-var.patch;patch=1 \
file://hostap-monitor-mode.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
${RPSRC}/logo_oh-r1.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 \
${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \
file://mmcsd_no_scr_check-r2.patch;patch=1 \
${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1 \