summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2005-08-31 13:54:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-31 13:54:30 +0000
commitfbabf992cd9f11e1260244d6f3ac13965a669b2f (patch)
tree296e343a65535783c61b3950ba02d82869714b62 /packages/linux
parentc6c07a6182b57e3b494370385cc07a0f124a000f (diff)
linux-openzaurus-2.6.13-rc5-mm1: add a patch to remove the SanDisk ConnectPlus card from the ide-cs driver. As both the ide and hostap drivers trying to access this card at same time is not currently working.
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc5-mm1/connectplus-remove-ide-HACK.patch10
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb3
2 files changed, 12 insertions, 1 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/connectplus-remove-ide-HACK.patch
new file mode 100644
index 0000000000..016f19a8b1
--- /dev/null
+++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/connectplus-remove-ide-HACK.patch
@@ -0,0 +1,10 @@
+--- linux-2.6.12/drivers/ide/legacy/ide-cs.c.orig 2005-08-31 13:12:31.369934424 +0000
++++ linux-2.6.12/drivers/ide/legacy/ide-cs.c 2005-08-31 13:12:42.584229592 +0000
+@@ -485,7 +485,6 @@
+ PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
+ PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card ", "KODAK ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
+ PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
+- PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+ PCMCIA_DEVICE_NULL,
+ };
+ MODULE_DEVICE_TABLE(pcmcia, ide_ids);
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 51e67763a5..33e9f95bba 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r19"
+PR = "r20"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -105,6 +105,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
file://pxa-serial-hack.patch;patch=1 \
${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
file://dtl1_cs-add-socket-revE.patch;patch=1 \
+ file://connectplus-remove-ide-HACK.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa-2.6 \
file://defconfig-collie \