summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-10-19 10:35:27 +0000
committerRichard Purdie <richard@openedhand.com>2007-10-19 10:35:27 +0000
commitaec382b478d6cced28a7cdf0dc7110a152978cf0 (patch)
tree6d7bbdc5c187193af8f3a145bbdb608f4f832c61 /meta/packages
parent62c6e3ef89aa62cd123e8bba73d98dcb9c205932 (diff)
downloadpoky-aec382b478d6cced28a7cdf0dc7110a152978cf0.tar.gz
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
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/mmcsd_no_scr_check-r2.patch29
-rw-r--r--meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/w100fb-unused-var.patch17
-rw-r--r--meta/packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb4
3 files changed, 49 insertions, 1 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/mmcsd_no_scr_check-r2.patch b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/mmcsd_no_scr_check-r2.patch
new file mode 100644
index 0000000000..ac2245f088
--- /dev/null
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/mmcsd_no_scr_check-r2.patch
@@ -0,0 +1,29 @@
1---
2 drivers/mmc/core/sd.c | 11 ++++++-----
3 1 file changed, 6 insertions(+), 5 deletions(-)
4
5Index: linux-2.6.23/drivers/mmc/core/sd.c
6===================================================================
7--- linux-2.6.23.orig/drivers/mmc/core/sd.c 2007-10-17 11:33:26.000000000 +0200
8+++ linux-2.6.23/drivers/mmc/core/sd.c 2007-10-17 11:33:49.000000000 +0200
9@@ -173,14 +173,15 @@
10
11 scr_struct = UNSTUFF_BITS(resp, 60, 4);
12 if (scr_struct != 0) {
13- printk(KERN_ERR "%s: unrecognised SCR structure version %d\n",
14+ printk(KERN_WARNING "%s: unrecognised SCR structure version %d\n",
15 mmc_hostname(card->host), scr_struct);
16- return -EINVAL;
17+ scr->sda_vsn = 0;
18+ scr->bus_widths = 0;
19+ } else {
20+ scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
21+ scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
22 }
23
24- scr->sda_vsn = UNSTUFF_BITS(resp, 56, 4);
25- scr->bus_widths = UNSTUFF_BITS(resp, 48, 4);
26-
27 return 0;
28 }
29
diff --git a/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/w100fb-unused-var.patch b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/w100fb-unused-var.patch
new file mode 100644
index 0000000000..8cbbb6bd01
--- /dev/null
+++ b/meta/packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/w100fb-unused-var.patch
@@ -0,0 +1,17 @@
1From: Marcin Juszkiewicz <openembedded@haerwu.biz>
2
3drivers/video/w100fb.c: In function ‘w100fb_imageblit’:
4drivers/video/w100fb.c:507: warning: unused variable ‘par’
5
6Signed-off-by: Marcin Juszkiewicz <openembedded@haerwu.biz>
7
8--- linux-2.6.23/drivers/video/w100fb.c 2007-10-11 16:52:30.000000000 +0200
9+++ linux-2.6.23/drivers/video/w100fb.c 2007-10-15 12:56:01.000000000 +0200
10@@ -504,7 +504,6 @@ static void w100_hostdata(u32 width, u32
11 static void w100fb_imageblit(struct fb_info *info,
12 const struct fb_image *image)
13 {
14- struct w100fb_par *par = info->par;
15 union dp_gui_master_cntl_u gmc;
16 u32 fgcolor, bgcolor;
17
diff --git a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
index 8ed38f31c1..93ffe19b6e 100644
--- a/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
+++ b/meta/packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
@@ -1,6 +1,6 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
6 6
@@ -36,12 +36,14 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
36 ${RPSRC}/pxa27x_overlay-r7.patch;patch=1 \ 36 ${RPSRC}/pxa27x_overlay-r7.patch;patch=1 \
37 ${RPSRC}/w100_extaccel-r1.patch;patch=1 \ 37 ${RPSRC}/w100_extaccel-r1.patch;patch=1 \
38 ${RPSRC}/w100_extmem-r1.patch;patch=1 \ 38 ${RPSRC}/w100_extmem-r1.patch;patch=1 \
39 file://w100fb-unused-var.patch;patch=1 \
39 file://hostap-monitor-mode.patch;patch=1 \ 40 file://hostap-monitor-mode.patch;patch=1 \
40 file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ 41 file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
41 ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \ 42 ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
42 ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ 43 ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
43 ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ 44 ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
44 ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \ 45 ${RPSRC}/mmcsd_large_cards-r1.patch;patch=1;status=hack \
46 file://mmcsd_no_scr_check-r2.patch;patch=1 \
45 ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \ 47 ${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
46 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ 48 ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
47 ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1 \ 49 ${RPSRC}/corgi_rearrange_lcd-r0.patch;patch=1 \