From 9ec06c2f4ed3e6d045baa77e35530fbc94656b8b Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 26 Jul 2006 21:27:55 +0000
Subject: linux-openzaurus-2.6.17: Fix some issues and make it the default
 kernel for Zaurii

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@556 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../hrw-pcmcia-ids-r3.patch                        | 31 ++++++++++++++++++++++
 meta/packages/linux/linux-openzaurus_2.6.17.bb     |  8 +++---
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch

(limited to 'meta')

diff --git a/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch b/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
new file mode 100644
index 000000000..b27fd0906
--- /dev/null
+++ b/meta/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
@@ -0,0 +1,31 @@
+
+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/meta/packages/linux/linux-openzaurus_2.6.17.bb b/meta/packages/linux/linux-openzaurus_2.6.17.bb
index 038acd451..3a1847409 100644
--- a/meta/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/meta/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,8 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r10"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "r12"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -30,8 +28,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            file://00-hostap.patch;patch=1;status=merged \
            file://10-pcnet.patch;patch=1;status=merged \
            ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \
-           ${RPSRC}/asoc_fixes2-r0.patch;patch=1 \
-           ${RPSRC}/hx2750_base-r26.patch;patch=1 \
+           ${RPSRC}/asoc_fixes2-r1.patch;patch=1 \
+           ${RPSRC}/hx2750_base-r27.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
            ${RPSRC}/pxa_keys-r5.patch;patch=1 \
-- 
cgit v1.2.3