linux-oz: added one more CF card into hrw-pcmcia-ids patch

9 files changed, 56 insertions, 63 deletions

diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch
index 5e3a5eaa20..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch
@@ -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@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),
diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r5.patch
index 5e3a5eaa20..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch
+++ b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r5.patch
@@ -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@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),
diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
deleted file mode 100644
index b27fd09068..0000000000
--- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-
-The ident for Seagate 8GB microdrive is
-"SEAGATE", "ST1"
-hash 0x76dc4190, 0xcfba9599
-manfid 0x0111, 0x0000
-
-CF card:
- product info: "SAMSUNG", "04/05/06", "", ""
- manfid : 0x0000, 0x0000
- function 4 (fixed disk)
-
-
-Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
-
- drivers/ide/legacy/ide-cs.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c
-===================================================================
---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c	2006-06-18 03:49:35.000000000 +0200
-+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c	2006-07-10 23:29:28.696446000 +0200
-@@ -402,6 +402,9 @@
- 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
- 	PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
- 	PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
-+	PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883),	/* Seagate 8GB microdrive */
-+	PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
-+	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("WIT", "IDE16", 0x244e5994, 0x3e232852),
diff --git a/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch
index 5e3a5eaa20..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r4.patch
+++ b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch
@@ -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@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),
diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r5.patch
index 5e3a5eaa20..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch
+++ b/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r5.patch
@@ -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@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),
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index cbb379d399..5011b1e070 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 require linux-openzaurus.inc
 
-PR = "r45"
+PR = "r46"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb
index 1ebd1023fb..97bb0234b2 100644
--- a/packages/linux/linux-openzaurus_2.6.17+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.17+git.bb
@@ -1,6 +1,6 @@
 require linux-openzaurus.inc
 
-PR = "r10"
+PR = "r11"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index faa56459da..d6ba2f70c3 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
 require linux-openzaurus.inc
 
-PR = "r27"
+PR = "r28"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
diff --git a/packages/linux/linux-openzaurus_2.6.18.bb b/packages/linux/linux-openzaurus_2.6.18.bb
index d4b4903e0c..88fbd0725d 100644
--- a/packages/linux/linux-openzaurus_2.6.18.bb
+++ b/packages/linux/linux-openzaurus_2.6.18.bb
@@ -1,6 +1,6 @@
 require linux-openzaurus.inc
 
-PR = "r2"
+PR = "r3"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046