diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-12-06 05:15:54 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-12-06 05:15:54 +0000 |
| commit | 52da0bdfcaf5c8d01ef59f49eb31d85bfb072cb2 (patch) | |
| tree | dd1a8b097328710b63d7eee22ee0a87691c023ce /packages/linux/linux-rp-2.6.17 | |
| parent | 87212b9bc9603e818c2fa262ca8113c462f8435b (diff) | |
| parent | e6e55cb2f8f61adff5027c8a025f9c3fbf6f99a0 (diff) | |
merge of 48b8740d774dc9eeaa0884be5c83aaf5f3201187
and 660478592ecf7024f18439b76307db524c1bc948
Diffstat (limited to 'packages/linux/linux-rp-2.6.17')
| -rw-r--r-- | packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch | 2 | ||||
| -rw-r--r-- | packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch | 31 |
2 files changed, 21 insertions, 12 deletions
diff --git a/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch b/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch index 7fa3822bba..4f9672299b 100644 --- a/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch +++ b/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch @@ -17065,7 +17065,7 @@ Index: linux-2.6-pxa-new/sound/soc/pxa/pxa2xx-ac97.c +{ + int ret; + -+ ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, IRQF_DISABLED, "AC97", NULL); ++ ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL); + if (ret < 0) + goto err; + diff --git a/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch index b5a570d38c..df1f6b3378 100644 --- a/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch +++ b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch @@ -22,19 +22,15 @@ Ridata 8GB Pro 150X Compact Flash Card: Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl> ---- -Patch follow kernel version 2.6.18 + drivers/ide/legacy/ide-cs.c | 5 +++++ + drivers/net/pcmcia/pcnet_cs.c | 2 ++ + 2 files changed, 7 insertions(+) -Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel - - ide-cs.c | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: linux-2.6/drivers/ide/legacy/ide-cs.c +Index: linux-2.6.18/drivers/ide/legacy/ide-cs.c =================================================================== ---- linux-2.6.orig/drivers/ide/legacy/ide-cs.c 2006-08-23 11:02:37.958306000 +0200 -+++ linux-2.6/drivers/ide/legacy/ide-cs.c 2006-09-25 16:45:35.765780000 +0200 -@@ -398,12 +398,17 @@ +--- linux-2.6.18.orig/drivers/ide/legacy/ide-cs.c 2006-12-06 00:55:51.000000000 +0000 ++++ linux-2.6.18/drivers/ide/legacy/ide-cs.c 2006-12-06 00:55:55.000000000 +0000 +@@ -398,12 +398,17 @@ static struct pcmcia_device_id ide_ids[] PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), @@ -52,3 +48,16 @@ Index: linux-2.6/drivers/ide/legacy/ide-cs.c PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e), +Index: linux-2.6.18/drivers/net/pcmcia/pcnet_cs.c +=================================================================== +--- linux-2.6.18.orig/drivers/net/pcmcia/pcnet_cs.c 2006-09-20 04:42:06.000000000 +0100 ++++ linux-2.6.18/drivers/net/pcmcia/pcnet_cs.c 2006-12-06 00:57:27.000000000 +0000 +@@ -1770,6 +1770,8 @@ static struct pcmcia_device_id pcnet_ids + PCMCIA_DEVICE_CIS_PROD_ID12("TAMARACK", "Ethernet", 0xcf434fba, 0x00b2e941, "tamarack.cis"), + PCMCIA_DEVICE_PROD_ID123("Fast Ethernet", "CF Size PC Card", "1.0", + 0xb4be14e3, 0x43ac239b, 0x0877b627), ++ PCMCIA_DEVICE_PROD_ID123("Ethernet", "CF Size PC Card", "1.0",exit ++ 0x00b2e941, 0x43ac239b, 0x0877b627), + PCMCIA_DEVICE_NULL + }; + MODULE_DEVICE_TABLE(pcmcia, pcnet_ids); |