[oe-commits] org.oe.oz354x linux-oz: added one more CF card into hrw-pcmcia-ids patch
hrw commit
openembedded-commits at lists.openembedded.org
Mon Sep 25 15:18:37 UTC 2006
linux-oz: added one more CF card into hrw-pcmcia-ids patch
Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 31839149b2a9fb6c7b1a1f6686943bc73316e965
ViewMTN: http://monotone.openembedded.org/revision.psp?id=31839149b2a9fb6c7b1a1f6686943bc73316e965
Files:
1
packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch
packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch
packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch
packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch
packages/linux/linux-openzaurus_2.6.16.bb
packages/linux/linux-openzaurus_2.6.17.bb
Diffs:
#
# mt diff -r77ac2850b3c9591a62856044e01c9eb9e1c57ddf -r31839149b2a9fb6c7b1a1f6686943bc73316e965
#
#
#
# delete "packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch"
#
# rename "packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch"
# to "packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch"
#
# rename "packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch"
# to "packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch"
#
# patch "packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch"
# from [d723fa6edadbd3157c6f431c8e6a642e02b05282]
# to [8649f67e1afd1682c7b6d5fca109a59a9715fe1d]
#
# patch "packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch"
# from [d723fa6edadbd3157c6f431c8e6a642e02b05282]
# to [8649f67e1afd1682c7b6d5fca109a59a9715fe1d]
#
# patch "packages/linux/linux-openzaurus_2.6.16.bb"
# from [1d00854451afadd11002fa7f6ba72a5c348546d7]
# to [b353412fc9fde633f28f6bc0072519717d4efaa0]
#
# patch "packages/linux/linux-openzaurus_2.6.17.bb"
# from [0ecbb58a13135913439c6ef7548a8990a4d9edbf]
# to [2972a809e80436e7383eaafffca0f15321866595]
#
============================================================
--- packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch d723fa6edadbd3157c6f431c8e6a642e02b05282
+++ packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch 8649f67e1afd1682c7b6d5fca109a59a9715fe1d
@@ -17,21 +17,24 @@ Ridata 8GB Pro 150X Compact Flash Card:
product info: "M-Systems", "CF500", ""
manfid: 0x000a, 0x0000
+ product info: "TRANSCEND", "TS4GCF120", ""
+ manfid: 0x000a, 0x0000
+
Signed-off-by: Marcin Juszkiewicz <openembedded at hrw.one.pl>
---
-Patch follow kernel version 2.6.17
+Patch follow kernel version 2.6.18
Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel
- ide-cs.c | 4 ++++
- 1 file changed, 4 insertions(+)
+ ide-cs.c | 5 +++++
+ 1 file changed, 5 insertions(+)
-Index: linux/drivers/ide/legacy/ide-cs.c
+Index: linux-2.6/drivers/ide/legacy/ide-cs.c
===================================================================
---- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200
-+++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200
-@@ -398,10 +398,14 @@
+--- 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 @@
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),
@@ -45,4 +48,7 @@ Index: linux/drivers/ide/legacy/ide-cs.c
+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
++ PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
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),
============================================================
--- packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch d723fa6edadbd3157c6f431c8e6a642e02b05282
+++ packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch 8649f67e1afd1682c7b6d5fca109a59a9715fe1d
@@ -17,21 +17,24 @@ Ridata 8GB Pro 150X Compact Flash Card:
product info: "M-Systems", "CF500", ""
manfid: 0x000a, 0x0000
+ product info: "TRANSCEND", "TS4GCF120", ""
+ manfid: 0x000a, 0x0000
+
Signed-off-by: Marcin Juszkiewicz <openembedded at hrw.one.pl>
---
-Patch follow kernel version 2.6.17
+Patch follow kernel version 2.6.18
Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel
- ide-cs.c | 4 ++++
- 1 file changed, 4 insertions(+)
+ ide-cs.c | 5 +++++
+ 1 file changed, 5 insertions(+)
-Index: linux/drivers/ide/legacy/ide-cs.c
+Index: linux-2.6/drivers/ide/legacy/ide-cs.c
===================================================================
---- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200
-+++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200
-@@ -398,10 +398,14 @@
+--- 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 @@
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),
@@ -45,4 +48,7 @@ Index: linux/drivers/ide/legacy/ide-cs.c
+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
++ PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),
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),
============================================================
--- packages/linux/linux-openzaurus_2.6.16.bb 1d00854451afadd11002fa7f6ba72a5c348546d7
+++ packages/linux/linux-openzaurus_2.6.16.bb b353412fc9fde633f28f6bc0072519717d4efaa0
@@ -1,6 +1,6 @@ require linux-openzaurus.inc
require linux-openzaurus.inc
-PR = "r47"
+PR = "r48"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -88,7 +88,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
${DOSRC}/kexec-arm-r2.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
- file://hrw-pcmcia-ids-r4.patch;patch=1 \
+ file://hrw-pcmcia-ids-r5.patch;patch=1 \
file://locomo-kbd-hotkeys.patch;patch=1 \
file://locomo-sysrq+keyrepeat.patch;patch=1 \
file://locomo-lcd-def-bightness.patch;patch=1 \
============================================================
--- packages/linux/linux-openzaurus_2.6.17.bb 0ecbb58a13135913439c6ef7548a8990a4d9edbf
+++ packages/linux/linux-openzaurus_2.6.17.bb 2972a809e80436e7383eaafffca0f15321866595
@@ -1,6 +1,6 @@ require linux-openzaurus.inc
require linux-openzaurus.inc
-PR = "r27"
+PR = "r28"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -50,7 +50,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
${RPSRC}/poodle_audio-r4.patch;patch=1 \
${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
- file://hrw-pcmcia-ids-r4.patch;patch=1 \
+ file://hrw-pcmcia-ids-r5.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 \
More information about the Openembedded-commits
mailing list